From owner-svn-src-user@FreeBSD.ORG  Mon Nov 16 00:17:12 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38D0B1065725;
	Mon, 16 Nov 2009 00:17:12 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 167FD8FC1A;
	Mon, 16 Nov 2009 00:17:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAG0HBHv052207;
	Mon, 16 Nov 2009 00:17:11 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAG0HBmt052205;
	Mon, 16 Nov 2009 00:17:11 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911160017.nAG0HBmt052205@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 16 Nov 2009 00:17:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199304 -
	user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Nov 2009 00:17:12 -0000

Author: kmacy
Date: Mon Nov 16 00:17:11 2009
New Revision: 199304
URL: http://svn.freebsd.org/changeset/base/199304

Log:
  drop bufobj lock before calling getblk

Modified:
  user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Nov 15 23:53:09 2009	(r199303)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Nov 16 00:17:11 2009	(r199304)
@@ -1354,8 +1354,10 @@ arc_gbincore_replace(struct vnode *vp, o
 			bgetvp(vp, newbp);
 			BO_UNLOCK(bo);
 			bp = newbp;
-		} else
+		} else {
+			BO_UNLOCK(bo);
 			bp = getblk(vp, blkno, size, 0, 0, flags);
+		}
 	} 
 
 	return (bp);