Date: Tue, 28 Apr 2015 07:15:35 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r282124 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201504280715.t3S7FZ45095484@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Tue Apr 28 07:15:34 2015 New Revision: 282124 URL: https://svnweb.freebsd.org/changeset/base/282124 Log: 5393 spurious failures from dsl_dataset_hold_obj() Author: Justin T. Gibbs <justing@spectralogic.com> 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> illumos/illumos-gate@e1f3c208abda53769a6531bb1141618555273460 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Tue Apr 28 07:14:08 2015 (r282123) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Tue Apr 28 07:15:34 2015 (r282124) @@ -405,11 +405,12 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504280715.t3S7FZ45095484>