svn commit: r200456 - user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Kip Macy]

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