diff options
| author | mm <mm@FreeBSD.org> | 2012-11-19 11:24:38 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-11-19 11:24:38 +0000 |
| commit | 08e2fe94c1fd972f615f3f2005adbd00bb9dd5c3 (patch) | |
| tree | 0cabb020ebddfc670915e4ac4b710b2782e65c48 | |
| parent | 41d196280da56a068e8eef3fe96776c74b2dd442 (diff) | |
| download | FreeBSD-src-08e2fe94c1fd972f615f3f2005adbd00bb9dd5c3.zip FreeBSD-src-08e2fe94c1fd972f615f3f2005adbd00bb9dd5c3.tar.gz | |
Update vendor-sys/illumos/dist to illumos-gate 13888:7204b3392a58
(bugix for illumos zfs issue #3236)
| -rw-r--r-- | uts/common/fs/zfs/dmu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/uts/common/fs/zfs/dmu.c b/uts/common/fs/zfs/dmu.c index fef2559..9aebb97 100644 --- a/uts/common/fs/zfs/dmu.c +++ b/uts/common/fs/zfs/dmu.c @@ -1565,7 +1565,8 @@ dmu_write_policy(objset_t *os, dnode_t *dn, int level, int wp, zio_prop_t *zp) 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 *dn, int level, int wp, zio_prop_t *zp) 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 *dn, int level, int wp, zio_prop_t *zp) */ compress = ZIO_COMPRESS_OFF; checksum = ZIO_CHECKSUM_OFF; - dedup = B_FALSE; - nopwrite = B_FALSE; } else { compress = zio_compress_select(dn->dn_compress, compress); |
