svn commit: r275542 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Sat Dec  6 00:18:53 2014
New Revision: 275542
URL: https://svnweb.freebsd.org/changeset/base/275542

Log:
  5311 traverse_dnode may report success when it should not
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Andriy Gapon <avg at FreeBSD.org>
  Reviewed by: Will Andrews <willa at spectralogic.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Justin T. Gibbs <justing at spectralogic.com>
  
  illumos/illumos-gate at 2a89c2c59b7c2beb2373c14368cbe7e32af6ffc1

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_traverse.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_traverse.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_traverse.c	Sat Dec  6 00:17:25 2014	(r275541)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_traverse.c	Sat Dec  6 00:18:53 2014	(r275542)
@@ -429,7 +429,7 @@ traverse_dnode(traverse_data_t *td, cons
 			break;
 	}
 
-	if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
+	if (err == 0 && dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
 		SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID);
 		err = traverse_visitbp(td, dnp, &dnp->dn_spill, &czb);
 	}