changeset 13888:7204b3392a58

3236 zio nop-write (fix uninitialized variables)
author George Wilson <george.wilson@delphix.com>
date Tue, 13 Nov 2012 23:04:01 -0800
parents 196932ec9e6a
children a67716f16746
files usr/src/uts/common/fs/zfs/dmu.c
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/dmu.c	Tue Nov 13 14:55:48 2012 -0800
+++ b/usr/src/uts/common/fs/zfs/dmu.c	Tue Nov 13 23:04:01 2012 -0800
@@ -1565,7 +1565,8 @@
 	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 @@
 		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 @@
 		 */
 		compress = ZIO_COMPRESS_OFF;
 		checksum = ZIO_CHECKSUM_OFF;
-		dedup = B_FALSE;
-		nopwrite = B_FALSE;
 	} else {
 		compress = zio_compress_select(dn->dn_compress, compress);