svn commit: r282125 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Andriy Gapon avg at FreeBSD.org
Tue Apr 28 07:37:39 UTC 2015


Author: avg
Date: Tue Apr 28 07:37:38 2015
New Revision: 282125
URL: https://svnweb.freebsd.org/changeset/base/282125

Log:
  MFV r282124: 5393 spurious failures from dsl_dataset_hold_obj()
  
  The actual bugfix was pro-actively committed in r275515.
  This MFV is cosmetic, it just aligns code style with the upstream.
  
  MFC after:	10 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Tue Apr 28 07:15:34 2015	(r282124)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Tue Apr 28 07:37:38 2015	(r282125)
@@ -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;


More information about the svn-src-head mailing list