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

[Kip Macy]

Author: kmacy
Date: Mon Feb 22 04:43:37 2010
New Revision: 204188
URL: http://svn.freebsd.org/changeset/base/204188

Log:
  _zio_cache_valid should be a no-op if page caching is disabled

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

Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c	Mon Feb 22 04:43:03 2010	(r204187)
+++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c	Mon Feb 22 04:43:37 2010	(r204188)
@@ -1025,6 +1025,9 @@ _zio_cache_valid(void *data, uint64_t si
 	buf_t bp;
 	int i;
 
+	if (zfs_page_cache_disable)
+		return;
+
 	bp = zio_buf_va_lookup(data, size);
 	if ((bp->b_flags & B_VMIO) == 0)
 		return;