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

[Xin LI]

Author: delphij
Date: Sat Dec 13 01:10:17 2014
New Revision: 275734
URL: https://svnweb.freebsd.org/changeset/base/275734

Log:
  MFV r275542:
  
  If a dnode has a spill block and there is an error while accessing
  a data block then traverse_dnode() loses information about that error
  and returns a status of visiting the spill block.
  
  This issue is discovered by Spectra Logic.
  
  Illumos issue:
      5311 traverse_dnode may report success when it should not
  
  Original author:	gibbs
  MFC after:		2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c	Fri Dec 12 21:54:59 2014	(r275733)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c	Sat Dec 13 01:10:17 2014	(r275734)
@@ -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);
 	}