Author: delphij
Date: Fri Jan 23 17:16:26 2015
New Revision: 277572
URL: https://svnweb.freebsd.org/changeset/base/277572

Log:
  MFC r275734: 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

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

Modified: 
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c     
Fri Jan 23 16:21:31 2015        (r277571)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c     
Fri Jan 23 17:16:26 2015        (r277572)
@@ -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);
        }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to