From 0d9df2e12d6a83b8934322f557844cc0bb7bd488 Mon Sep 17 00:00:00 2001 From: jeff Date: Sun, 13 Mar 2005 12:18:25 +0000 Subject: - The VI_DOOMED flag now signals the end of a vnode's relationship with the filesystem. Check that rather than VI_XLOCK. - VOP_INACTIVE should no longer drop the vnode lock. - The vnode lock is required around calls to vrecycle() and vgone(). Sponsored by: Isilon Systems, Inc. --- sys/fs/nullfs/null_subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/fs/nullfs/null_subr.c') diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index ac54c21..f6543b2 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -128,7 +128,7 @@ loop: * recycling the nullfs vnode or another thread * in vrele() waiting for the vnode lock. */ - if ((vp->v_iflag & VI_XLOCK) != 0) { + if ((vp->v_iflag & VI_DOOMED) != 0) { VI_UNLOCK(vp); continue; } @@ -177,7 +177,7 @@ loop: * recycling the nullfs vnode or another thread * in vrele() waiting for the vnode lock. */ - if ((ovp->v_iflag & VI_XLOCK) != 0) { + if ((ovp->v_iflag & VI_DOOMED) != 0) { VI_UNLOCK(ovp); continue; } -- cgit v1.1