From owner-svn-src-user@FreeBSD.ORG  Mon Nov 23 03:44:26 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 F38C9106568B;
	Mon, 23 Nov 2009 03:44:25 +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 E2BE78FC12;
	Mon, 23 Nov 2009 03:44:25 +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 nAN3iPtN039359;
	Mon, 23 Nov 2009 03:44:25 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN3iP13039358;
	Mon, 23 Nov 2009 03:44:25 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911230344.nAN3iP13039358@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 23 Nov 2009 03:44:25 +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: r199688 -
	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, 23 Nov 2009 03:44:26 -0000

Author: kmacy
Date: Mon Nov 23 03:44:25 2009
New Revision: 199688
URL: http://svn.freebsd.org/changeset/base/199688

Log:
  don't recursively lock bufobj

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	Mon Nov 23 01:59:12 2009	(r199687)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Nov 23 03:44:25 2009	(r199688)
@@ -1351,7 +1351,7 @@ arc_binval(spa_t *spa, dva_t *dva, uint6
 }
 
 static void
-arc_pcache(struct vnode *vp, struct buf *bp, uint64_t blkno)
+arc_pcache(struct vnode *vp, struct buf *bp, uint64_t blkno, int lockneeded)
 {
 	vm_pindex_t start = OFF_TO_IDX((blkno << 9));
 	vm_object_t object = vp->v_object;
@@ -1368,7 +1368,8 @@ arc_pcache(struct vnode *vp, struct buf 
 		vm_page_insert(m, object, start + i);
 	}
 	VM_OBJECT_UNLOCK(object);
-	BO_LOCK(bo);
+	if (lockneeded)
+		BO_LOCK(bo);
 	bgetvp(vp, bp);
 	BO_UNLOCK(bo);
 	bp->b_flags |= B_VMIO;
@@ -1414,9 +1415,9 @@ arc_bcache(arc_buf_t *buf)
 		} 
 		brelse(bp);
 		if (cachebuf)
-			arc_pcache(vp, newbp, blkno);
+			arc_pcache(vp, newbp, blkno, TRUE);
 	} else if (cachebuf) 
-		arc_pcache(vp, newbp, blkno);
+		arc_pcache(vp, newbp, blkno, FALSE);
 	else
 		BO_UNLOCK(bo);
 }