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

Reverse lock order by using local variable. This will shut up "acquiring

Browse Source 
duplicate lock of same type" message.

Reviewed by:	mckusick
This commit is contained in:
Jun Kuriyama 2004-02-12 08:52:08 +00:00
parent cd54ef88cb
commit 5580f04ab0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/ufs/ffs/ffs_snapshot.c
View File

@ -488,9 +488,10 @@ ffs_snapshot(mp, snapfile)
VI_LOCK(devvp);
snaphead = &devvp->v_rdev->si_snapshots;
if ((xp = TAILQ_FIRST(snaphead)) != NULL) {
VI_LOCK(vp);
vp->v_vnlock = ITOV(xp)->v_vnlock;
struct lock *lkp = ITOV(xp)->v_vnlock;
VI_UNLOCK(devvp);
VI_LOCK(vp);
vp->v_vnlock = lkp;
} else {
struct lock *lkp;
@ -1793,9 +1794,10 @@ ffs_snapshot_mount(mp)
*/
VI_LOCK(devvp);
if ((xp = TAILQ_FIRST(snaphead)) != NULL) {
VI_LOCK(vp);
vp->v_vnlock = ITOV(xp)->v_vnlock;
struct lock *lkp = ITOV(xp)->v_vnlock;
VI_UNLOCK(devvp);
VI_LOCK(vp);
vp->v_vnlock = lkp;
} else {
struct lock *lkp;