From owner-svn-src-user@FreeBSD.ORG  Mon Nov 16 02:46:21 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 D727D106566B;
	Mon, 16 Nov 2009 02:46:21 +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 C5E838FC0C;
	Mon, 16 Nov 2009 02:46:21 +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 nAG2kLk8055159;
	Mon, 16 Nov 2009 02:46:21 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAG2kLTb055157;
	Mon, 16 Nov 2009 02:46:21 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911160246.nAG2kLTb055157@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 16 Nov 2009 02:46:21 +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: r199305 -
	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 02:46:21 -0000

Author: kmacy
Date: Mon Nov 16 02:46:21 2009
New Revision: 199305
URL: http://svn.freebsd.org/changeset/base/199305

Log:
  fix logic for end of arc_gbincore_replace

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 16 00:17:11 2009	(r199304)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Nov 16 02:46:21 2009	(r199305)
@@ -1306,7 +1306,6 @@ arc_gbincore_replace(struct vnode *vp, o
 {
 	struct buf *bp;
 	struct bufobj *bo;
-	int associated = 0;
 
 	/*
 	 * We need to be careful to handle the case where the buffer
@@ -1342,24 +1341,30 @@ arc_gbincore_replace(struct vnode *vp, o
 				bremfree(bp);
 				if (bp->b_bcount != size)
 					allocbuf_flags(bp, size, flags);
-				associated = 1;
+				goto done;
 			}
 		}
 	}
 
-	if (!associated) {
-		if (newbp != NULL) {
-			if (bp != NULL)
-				BO_LOCK(bo);
-			bgetvp(vp, newbp);
-			BO_UNLOCK(bo);
-			bp = newbp;
-		} else {
+	/*
+	 *   	   !bp    		brelvp(bp)  	brelse(bp)	associated  
+	 * !newbp  unlock()/getblk 	getblk	    	XXX		no-op	  	
+	 *
+	 * newbp  bgetvp()/ul		l/bgetvp()/ul	l/bgetvp()/ul	XXX
+	 */
+	if (newbp != NULL) {
+		if (bp != NULL)
+			BO_LOCK(bo);
+		bgetvp(vp, newbp);
+		BO_UNLOCK(bo);
+		bp = newbp;
+	} else {
+		if (bp == NULL) 
 			BO_UNLOCK(bo);
-			bp = getblk(vp, blkno, size, 0, 0, flags);
-		}
+		bp = getblk(vp, blkno, size, 0, 0, flags);
 	} 
 
+done:
 	return (bp);
 }