From owner-svn-src-all@FreeBSD.ORG  Wed Jan 28 18:10:57 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E25551065672;
	Wed, 28 Jan 2009 18:10:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D0C0E8FC21;
	Wed, 28 Jan 2009 18:10:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SIAv5w028236;
	Wed, 28 Jan 2009 18:10:57 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SIAvBS028235;
	Wed, 28 Jan 2009 18:10:57 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200901281810.n0SIAvBS028235@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 28 Jan 2009 18:10:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187832 - head/sys/fs/fifofs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2009 18:10:59 -0000

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);