From owner-p4-projects@FreeBSD.ORG  Sun Jun 10 02:28:24 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 089941065675; Sun, 10 Jun 2012 02:28:24 +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 BF5BF1065672
	for <perforce@freebsd.org>; Sun, 10 Jun 2012 02:28:23 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id A8A7B8FC16
	for <perforce@freebsd.org>; Sun, 10 Jun 2012 02:28:23 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q5A2SNop019778
	for <perforce@freebsd.org>; Sun, 10 Jun 2012 02:28:23 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5A2SNZG019775
	for perforce@freebsd.org; Sun, 10 Jun 2012 02:28:23 GMT
	(envelope-from jhb@freebsd.org)
Date: Sun, 10 Jun 2012 02:28:23 GMT
Message-Id: <201206100228.q5A2SNZG019775@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 212551 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 10 Jun 2012 02:28:24 -0000

http://p4web.freebsd.org/@@212551?ac=10

Change 212551 by jhb@jhb_fiver on 2012/06/10 02:27:40

	Fix locking bogon.

Affected files ...

.. //depot/projects/fadvise/sys/kern/vfs_subr.c#11 edit

Differences ...

==== //depot/projects/fadvise/sys/kern/vfs_subr.c#11 (text+ko) ====

@@ -1352,12 +1352,12 @@
 		error = BUF_TIMELOCK(bp,
 		    LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_MTX(bo),
 		    "detachbuf", slpflag, slptimeo);
-		if (error != ENOLCK)
-			return (error);
-		if (error == EAGAIN) {
+		if (error == ENOLCK) {
 			BO_LOCK(bo);
 			goto restart;
 		}
+		if (error)
+			return (error);
 		KASSERT(bp->b_bufobj == bo,
 		    ("bp %p wrong b_bufobj %p should be %p",
 		    bp, bp->b_bufobj, bo));