From owner-svn-src-user@FreeBSD.ORG  Sat Nov 14 23:35:37 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 DB660106566B;
	Sat, 14 Nov 2009 23:35:37 +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 C9ED78FC1D;
	Sat, 14 Nov 2009 23:35:37 +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 nAENZbTO016513;
	Sat, 14 Nov 2009 23:35:37 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAENZbZq016511;
	Sat, 14 Nov 2009 23:35:37 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911142335.nAENZbZq016511@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 14 Nov 2009 23:35:37 +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: r199283 -
	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: Sat, 14 Nov 2009 23:35:37 -0000

Author: kmacy
Date: Sat Nov 14 23:35:37 2009
New Revision: 199283
URL: http://svn.freebsd.org/changeset/base/199283

Log:
  simplify page cache invalidation when doing buffer cloning in the ARC

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	Sat Nov 14 22:08:32 2009	(r199282)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Nov 14 23:35:37 2009	(r199283)
@@ -1259,9 +1259,7 @@ arc_buf_clone(arc_buf_t *from)
 	hdr->b_buf = buf;
 	hdr->b_flags |= ARC_BUF_CLONING;
 	arc_get_data_buf(buf);
-#ifdef nomore	
 	bcopy(from->b_data, buf->b_data, size);
-#endif	
 	hdr->b_datacnt += 1;
 	return (buf);
 }
@@ -1327,7 +1325,7 @@ arc_getblk(arc_buf_t *buf)
 	if ((size < PAGE_SIZE)) {
 		data = zio_buf_alloc(size);
 	} else if ((buf->b_hdr->b_flags & ARC_BUF_CLONING) ||
-	    BUF_EMPTY(buf->b_hdr)) {		
+	    BUF_EMPTY(buf->b_hdr)) {
 		newbp = geteblk(size, flags);
 		data = newbp->b_data;		
 	} else {
@@ -1363,15 +1361,12 @@ arc_getblk(arc_buf_t *buf)
 		data = newbp->b_data;		
 	}
 
-	if (buf->b_hdr->b_flags & ARC_BUF_CLONING) {
-		vp = spa_get_vnode(spa);
+	if ((buf->b_hdr->b_flags & ARC_BUF_CLONING) &&
+	    (size >= PAGE_SIZE) &&
+	    (!BUF_EMPTY(buf->b_hdr)))
+		arc_binval(buf, blkno, vp, size, newbp);
+	buf->b_hdr->b_flags &= ~ARC_BUF_CLONING;
 
-		bcopy(buf->b_next->b_data, data, size);
-		if (size >= PAGE_SIZE)
-			arc_binval(buf, blkno, vp, size, newbp);
-		buf->b_hdr->b_flags &= ~ARC_BUF_CLONING;		
-	} 
-	
 #ifdef LOGALL
 	/*
 	 * not useful for tracking down collisions