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

vfs: always clear VI_OWEINACT in consumers bumping v_usecount

Browse Source 
Previously vputx would detect the condition and clear the flag.

With this change it is invalid to have both v_usecount > 0 and the flag
set. Assert the condition is met in all revlevant places.

Reviewed by:	kib
This commit is contained in:
mjg 2015-07-11 16:28:55 +00:00
parent 74d7b1e72e
commit b3b0716b63
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/vfs_subr.c
View File

@ -2082,6 +2082,10 @@ v_incr_usecount(struct vnode *vp)
{
CTR2(KTR_VFS, "%s: vp %p", __func__, vp);
VNASSERT(vp->v_usecount == 0 || (vp->v_iflag & VI_OWEINACT) == 0, vp,
("vnode with usecount and VI_OWEINACT set"));
if (vp->v_iflag & VI_OWEINACT)
vp->v_iflag &= ~VI_OWEINACT;
vholdl(vp);
vp->v_usecount++;
v_incr_devcount(vp);
@ -2199,6 +2203,8 @@ vget(struct vnode *vp, int flags, struct thread *td)
if (vp->v_iflag & VI_DOOMED && (flags & LK_RETRY) == 0)
panic("vget: vn_lock failed to return ENOENT\n");
VI_LOCK(vp);
VNASSERT(vp->v_usecount == 0 || (vp->v_iflag & VI_OWEINACT) == 0, vp,
("vnode with usecount and VI_OWEINACT set"));
/* Upgrade our holdcnt to a usecount. */
v_upgrade_usecount(vp);
/*
@ -2318,8 +2324,8 @@ vputx(struct vnode *vp, int func)
}
break;
}
if (vp->v_usecount > 0)
vp->v_iflag &= ~VI_OWEINACT;
VNASSERT(vp->v_usecount == 0 || (vp->v_iflag & VI_OWEINACT) == 0, vp,
("vnode with usecount and VI_OWEINACT set"));
if (error == 0) {
if (vp->v_iflag & VI_OWEINACT)
vinactive(vp, curthread);