summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2013-02-23 11:21:05 +0000
committermm <mm@FreeBSD.org>2013-02-23 11:21:05 +0000
commit573dc178949e8bde0eb397715f16a11fac455312 (patch)
treef15069e3625afc886e4373fe209badca875d2999 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
parent4432e4c15f8200e334bbff080e7a466c41f1fadd (diff)
downloadFreeBSD-src-573dc178949e8bde0eb397715f16a11fac455312.zip
FreeBSD-src-573dc178949e8bde0eb397715f16a11fac455312.tar.gz
MFV r246653:
Import vendor change to avoid "unitialized variable" warnings. Illumos ZFS issues: 3522 zfs module should not allow uninitialized variables References: https://www.illumos.org/issues/3522
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
index 3167d42..fc606d5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
@@ -408,8 +408,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint64_t length,
if (dn->dn_objset->os_dsl_dataset)
dp = dn->dn_objset->os_dsl_dataset->ds_dir->dd_pool;
- if (dp && dsl_pool_sync_context(dp))
- start = gethrtime();
+ start = gethrtime();
zio = zio_root(dn->dn_objset->os_spa, NULL, NULL, ZIO_FLAG_CANFAIL);
blkid = dbuf_whichblock(dn, offset);
for (i = 0; i < nblks; i++) {
OpenPOWER on IntegriCloud