From owner-svn-src-user@FreeBSD.ORG  Mon Feb 22 04:43:37 2010
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 7B4CA106566B;
	Mon, 22 Feb 2010 04:43: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 6A0028FC0A;
	Mon, 22 Feb 2010 04:43: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 o1M4hbjg039241;
	Mon, 22 Feb 2010 04:43:37 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1M4hbZa039239;
	Mon, 22 Feb 2010 04:43:37 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201002220443.o1M4hbZa039239@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 22 Feb 2010 04:43: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: r204188 -
	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: Mon, 22 Feb 2010 04:43:37 -0000

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;