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

- Move code that should probably be an assert above the main body of

Browse Source 
vrele so that we can decrease the indentation of the real work and
   make things slightly more clear.

Sponsored by:	Isilon Systems, Inc.
This commit is contained in:
jeff 2005-03-28 11:18:47 +00:00
parent 7743cc27d9
commit 8c749eb801
1 changed files with 14 additions and 15 deletions

29
sys/kern/vfs_subr.c

@ -1908,6 +1908,7 @@ vput(vp)
struct thread *td = curthread; /* XXX */
KASSERT(vp != NULL, ("vput: null vp"));
ASSERT_VOP_LOCKED(vp, "vput");
VI_LOCK(vp);
/* Skip this v_writecount check if we're going to panic below. */
VNASSERT(vp->v_writecount < vp->v_usecount || vp->v_usecount < 1, vp,
@ -1920,26 +1921,24 @@ vput(vp)
return;
}
if (vp->v_usecount == 1) {
v_incr_usecount(vp, -1);
if (VOP_ISLOCKED(vp, td) != LK_EXCLUSIVE &&
VOP_LOCK(vp, LK_EXCLUPGRADE, td) != 0)
vp->v_iflag |= VI_OWEINACT;
else
vinactive(vp, td);
VOP_UNLOCK(vp, 0, td);
if (VSHOULDFREE(vp))
vfree(vp);
else
vlruvp(vp);
VI_UNLOCK(vp);
} else {
if (vp->v_usecount != 1) {
#ifdef DIAGNOSTIC
vprint("vput: negative ref count", vp);
#endif
panic("vput: negative ref cnt");
}
v_incr_usecount(vp, -1);
if (VOP_ISLOCKED(vp, td) != LK_EXCLUSIVE &&
VOP_LOCK(vp, LK_EXCLUPGRADE, td) != 0)
vp->v_iflag |= VI_OWEINACT;
else
vinactive(vp, td);
VOP_UNLOCK(vp, 0, td);
if (VSHOULDFREE(vp))
vfree(vp);
else
vlruvp(vp);
VI_UNLOCK(vp);
}
/*