From owner-svn-src-user@FreeBSD.ORG  Sat Dec 12 23:47:31 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 BAA0E1065679;
	Sat, 12 Dec 2009 23:47:31 +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 A9A6F8FC14;
	Sat, 12 Dec 2009 23:47:31 +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 nBCNlVAv067466;
	Sat, 12 Dec 2009 23:47:31 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBCNlVC6067464;
	Sat, 12 Dec 2009 23:47:31 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200912122347.nBCNlVC6067464@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 12 Dec 2009 23:47:31 +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: r200456 -
	user/kmacy/releng_8_fcs_buf_xen/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, 12 Dec 2009 23:47:31 -0000

Author: kmacy
Date: Sat Dec 12 23:47:31 2009
New Revision: 200456
URL: http://svn.freebsd.org/changeset/base/200456

Log:
  don't check for buffer cache hit in ARC, this is now handled by zbio_sync_cache in zio_create

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

Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Dec 12 23:41:15 2009	(r200455)
+++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Dec 12 23:47:31 2009	(r200456)
@@ -2918,21 +2918,6 @@ top:
 		rzio = zio_read(pio, spa, bp, buf->b_data, size,
 		    arc_read_done, buf, priority, zio_flags, zb);
 
-		/*
-		 * We hit in the page cache - can bypass the I/O stages
-		 *
-		 */
-#ifdef _KERNEL
-		if ((buf->b_bp != NULL) &&
-		    ((buf->b_bp->b_flags & (B_CACHE|B_INVAL)) == B_CACHE)) {
-			/*
-			 * track the number of times
-			 * the buffer was found in the cache
-			 */
-			ARCSTAT_BUMP(arcstat_page_cache_hits);
-			rzio->io_pipeline = ZIO_INTERLOCK_STAGES;
-		}
-#endif
 		if (*arc_flags & ARC_WAIT)
 			return (zio_wait(rzio));