svn commit: r187832 - head/sys/fs/fifofs

[John Baldwin]

Author: jhb
Date: Wed Jan 28 18:10:57 2009
New Revision: 187832
URL: http://svn.freebsd.org/changeset/base/187832

Log:
  Assert an exclusive vnode lock for fifo_cleanup() and fifo_close() since
  they change v_fifoinfo.
  
  Discussed with:	ups (a while ago)

Modified:
  head/sys/fs/fifofs/fifo_vnops.c

Modified: head/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- head/sys/fs/fifofs/fifo_vnops.c	Wed Jan 28 18:00:22 2009	(r187831)
+++ head/sys/fs/fifofs/fifo_vnops.c	Wed Jan 28 18:10:57 2009	(r187832)
@@ -149,7 +149,7 @@ fifo_cleanup(struct vnode *vp)
 {
 	struct fifoinfo *fip = vp->v_fifoinfo;
 
-	ASSERT_VOP_LOCKED(vp, "fifo_cleanup");
+	ASSERT_VOP_ELOCKED(vp, "fifo_cleanup");
 	if (fip->fi_readers == 0 && fip->fi_writers == 0) {
 		vp->v_fifoinfo = NULL;
 		(void)soclose(fip->fi_readsock);
@@ -422,7 +422,7 @@ fifo_close(ap)
 	struct vnode *vp = ap->a_vp;
 	struct fifoinfo *fip = vp->v_fifoinfo;
 
-	ASSERT_VOP_LOCKED(vp, "fifo_close");
+	ASSERT_VOP_ELOCKED(vp, "fifo_close");
 	if (fip == NULL) {
 		printf("fifo_close: no v_fifoinfo %p\n", vp);
 		return (0);