svn commit: r243267 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Mon Nov 19 11:24:38 2012
New Revision: 243267
URL: http://svnweb.freebsd.org/changeset/base/243267

Log:
  Update vendor-sys/illumos/dist to illumos-gate 13888:7204b3392a58
  (bugix for illumos zfs issue #3236)

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c	Mon Nov 19 11:22:32 2012	(r243266)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c	Mon Nov 19 11:24:38 2012	(r243267)
@@ -1565,7 +1565,8 @@ dmu_write_policy(objset_t *os, dnode_t *
 	enum zio_checksum checksum = os->os_checksum;
 	enum zio_compress compress = os->os_compress;
 	enum zio_checksum dedup_checksum = os->os_dedup_checksum;
-	boolean_t dedup, nopwrite;
+	boolean_t dedup = B_FALSE;
+	boolean_t nopwrite = B_FALSE;
 	boolean_t dedup_verify = os->os_dedup_verify;
 	int copies = os->os_copies;
 
@@ -1594,9 +1595,6 @@ dmu_write_policy(objset_t *os, dnode_t *
 		if (zio_checksum_table[checksum].ci_correctable < 1 ||
 		    zio_checksum_table[checksum].ci_eck)
 			checksum = ZIO_CHECKSUM_FLETCHER_4;
-
-		dedup = B_FALSE;
-		nopwrite = B_FALSE;
 	} else if (wp & WP_NOFILL) {
 		ASSERT(level == 0);
 
@@ -1609,8 +1607,6 @@ dmu_write_policy(objset_t *os, dnode_t *
 		 */
 		compress = ZIO_COMPRESS_OFF;
 		checksum = ZIO_CHECKSUM_OFF;
-		dedup = B_FALSE;
-		nopwrite = B_FALSE;
 	} else {
 		compress = zio_compress_select(dn->dn_compress, compress);