svn commit: r199688 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Kip Macy kmacy at FreeBSD.org
Mon Nov 23 03:44:26 UTC 2009


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


More information about the svn-src-user mailing list