From owner-p4-projects@FreeBSD.ORG  Sat Jun 13 02:44:50 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CAC371065674; Sat, 13 Jun 2009 02:44:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8ACC3106564A
	for <perforce@FreeBSD.org>; Sat, 13 Jun 2009 02:44:49 +0000 (UTC)
	(envelope-from zhaoshuai@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 790748FC0C
	for <perforce@FreeBSD.org>; Sat, 13 Jun 2009 02:44:49 +0000 (UTC)
	(envelope-from zhaoshuai@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5D2innq060474
	for <perforce@FreeBSD.org>; Sat, 13 Jun 2009 02:44:49 GMT
	(envelope-from zhaoshuai@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5D2inJH060472
	for perforce@freebsd.org; Sat, 13 Jun 2009 02:44:49 GMT
	(envelope-from zhaoshuai@FreeBSD.org)
Date: Sat, 13 Jun 2009 02:44:49 GMT
Message-Id: <200906130244.n5D2inJH060472@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhaoshuai@FreeBSD.org using -f
From: Zhao Shuai <zhaoshuai@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 164226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 02:44:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=164226

Change 164226 by zhaoshuai@zhaoshuai on 2009/06/13 02:43:56

	fix fifo_open(): forget releasing the mutex before returning ENXIO.

Affected files ...

.. //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#14 edit

Differences ...

==== //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#14 (text+ko) ====

@@ -184,10 +184,13 @@
 			wakeup(&fip->fi_writers);
 	}
 	if (ap->a_mode & FWRITE) {
-		if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) 
+		if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) {
+			/* XXX release all resources here? */
+			mtx_unlock(&fifo_mtx);
 			return (ENXIO);
+		}
 		fip->fi_writers++;		
-		if (fip->fi_writers == 1 && fip->fi_readers > 0)
+		if (fip->fi_writers == 1 && fip->fi_readers > 0) 
 			wakeup(&fip->fi_readers);
 	}
 	if ((ap->a_mode & O_NONBLOCK) == 0) {