svn commit: r193980 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Kip Macy]

Author: kmacy
Date: Thu Jun 11 09:51:21 2009
New Revision: 193980
URL: http://svn.freebsd.org/changeset/base/193980

Log:
  check against prefetch_enable

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Thu Jun 11 09:06:09 2009	(r193979)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Thu Jun 11 09:51:21 2009	(r193980)
@@ -326,7 +326,7 @@ dmu_prefetch(objset_t *os, uint64_t obje
 	uint64_t blkid;
 	int nblks, i, err;
 
-	if (zfs_prefetch_disable)
+	if (zfs_prefetch_enable == 0)
 		return;
 
 	if (len == 0) {  /* they're interested in the bonus buffer */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c	Thu Jun 11 09:06:09 2009	(r193979)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c	Thu Jun 11 09:51:21 2009	(r193980)
@@ -598,7 +598,7 @@ dmu_zfetch(zfetch_t *zf, uint64_t offset
 	unsigned int	blkshft;
 	uint64_t	blksz;
 
-	if (zfs_prefetch_disable)
+	if (zfs_prefetch_enable == 0)
 		return;
 
 	/* files that aren't ln2 blocksz are only one block -- nothing to do */

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h	Thu Jun 11 09:06:09 2009	(r193979)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h	Thu Jun 11 09:51:21 2009	(r193980)
@@ -457,7 +457,7 @@ int dmu_write_uio(objset_t *os, uint64_t
 int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset,
     uint64_t size, struct page *pp, dmu_tx_t *tx);
 
-extern int zfs_prefetch_disable;
+extern int zfs_prefetch_enable;
 
 /*
  * Asynchronously try to read in the data.