- 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.

1 files changed, 0 insertions, 4 deletions

diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index fba7d10..36e7478 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -447,11 +447,8 @@ fifo_close(ap)
 	} */ *ap;
 {
 	struct vnode *vp = ap->a_vp;
-	struct thread *td = ap->a_td;
 	struct fifoinfo *fip = vp->v_fifoinfo;
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
-
 	if (ap->a_fflag & FREAD) {
 		fip->fi_readers--;
 		if (fip->fi_readers == 0)
@@ -463,7 +460,6 @@ fifo_close(ap)
 			socantrcvmore(fip->fi_readsock);
 	}
 	fifo_cleanup(vp);
-	VOP_UNLOCK(vp, 0, td);
 	return (0);
 }