svn commit: r282755 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Mon May 11 08:36:58 2015
New Revision: 282755
URL: https://svnweb.freebsd.org/changeset/base/282755

Log:
  MFC r282125: MFV r282124: 5393 spurious failures from dsl_dataset_hold_obj()

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Mon May 11 08:34:08 2015	(r282754)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Mon May 11 08:36:58 2015	(r282755)
@@ -413,7 +413,8 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin
 		    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;