Illumos 5393 - spurious failures from dsl_dataset_hold_obj()

5393 spurious failures from dsl_dataset_hold_obj()
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Will Andrews <willa@spectralogic.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Steven Hartland <killing@multiplay.co.uk>
Approved by: Dan McDonald <danmcd@omniti.com>

References:
  https://www.illumos.org/issues/5393
  https://github.com/illumos/illumos-gate/commit/e1f3c20

Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3403

diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c
index 9a66c6552133b831730569566534a54b62b117e2..dacb6678e4bf04b9220e35154fd85609f3ff29ec 100644 (file)
--- a/module/zfs/dsl_dataset.c
+++ b/module/zfs/dsl_dataset.c
@@ -426,11 +426,12 @@ 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) {
-                       err = zap_contains(mos, dsobj, DS_FIELD_LARGE_BLOCKS);
-                       if (err == 0)
+                       int zaperr = zap_contains(mos, dsobj,
+                           DS_FIELD_LARGE_BLOCKS);
+                       if (zaperr != ENOENT) {
+                               VERIFY0(zaperr);
                                ds->ds_large_blocks = B_TRUE;
-                       else
-                               ASSERT3U(err, ==, ENOENT);
+                       }
                }
 
                if (err == 0) {