summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2015-05-11 08:36:58 +0000
committeravg <avg@FreeBSD.org>2015-05-11 08:36:58 +0000
commit0b01455958dd7fb287d94448b369f4b3d6945533 (patch)
tree69cd2bea3e84072b01222ec6ff8fa52dcdfec642 /sys/cddl
parent87689acc05fbd61df48e9f7530361e1619e18164 (diff)
downloadFreeBSD-src-0b01455958dd7fb287d94448b369f4b3d6945533.zip
FreeBSD-src-0b01455958dd7fb287d94448b369f4b3d6945533.tar.gz
MFC r282125: MFV r282124: 5393 spurious failures from dsl_dataset_hold_obj()
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
index ce22f4e..58db4dd 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
@@ -413,7 +413,8 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
offsetof(dmu_sendarg_t, dsa_link));
if (doi.doi_type == DMU_OTN_ZAP_METADATA) {
- int zaperr = zap_contains(mos, dsobj, DS_FIELD_LARGE_BLOCKS);
+ int zaperr = zap_contains(mos, dsobj,
+ DS_FIELD_LARGE_BLOCKS);
if (zaperr != ENOENT) {
VERIFY0(zaperr);
ds->ds_large_blocks = B_TRUE;
OpenPOWER on IntegriCloud