d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Fixed rename panic issue

Browse Source 
Submitted by:	Masanori OZAWA (ozawa@ongs.co.jp)
MFC after:	1 week
This commit is contained in:
Daichi GOTO 2008-04-25 09:44:47 +00:00
parent a9b794ff5e
commit 5307411cbe
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/fs/unionfs/union_vnops.c
View File

@ -1165,6 +1165,9 @@ unionfs_rename(struct vop_rename_args *ap)
}
}
if (rfvp == rtvp)
goto unionfs_rename_abort;
if (needrelookup != 0) {
if ((error = vn_lock(fdvp, LK_EXCLUSIVE)) != 0)
goto unionfs_rename_abort;
@ -1192,10 +1195,6 @@ unionfs_rename(struct vop_rename_args *ap)
cache_purge(fdvp);
}
if (fdvp != rfdvp)
vrele(fdvp);
if (fvp != rfvp)
vrele(fvp);
if (ltdvp != NULLVP)
VOP_UNLOCK(ltdvp, 0);
if (tdvp != rtdvp)
@ -1208,27 +1207,31 @@ unionfs_rename(struct vop_rename_args *ap)
else
vrele(tvp);
}
if (fdvp != rfdvp)
vrele(fdvp);
if (fvp != rfvp)
vrele(fvp);
UNIONFS_INTERNAL_DEBUG("unionfs_rename: leave (%d)\n", error);
return (error);
unionfs_rename_abort:
if (fdvp != rfdvp)
vrele(rfdvp);
if (fvp != rfvp)
vrele(rfvp);
vput(tdvp);
if (tdvp != rtdvp)
vrele(rtdvp);
vput(tdvp);
if (tvp != rtvp && rtvp != NULLVP)
vrele(rtvp);
if (tvp != NULLVP) {
if (tdvp != tvp)
vput(tvp);
else
vrele(tvp);
}
if (tvp != rtvp && rtvp != NULLVP)
vrele(rtvp);
if (fdvp != rfdvp)
vrele(rfdvp);
if (fvp != rfvp)
vrele(rfvp);
vrele(fdvp);
vrele(fvp);