summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-12-13 01:10:17 +0000
committerdelphij <delphij@FreeBSD.org>2014-12-13 01:10:17 +0000
commit12b51b69b59bea2caedce712cb92b19326ced074 (patch)
tree6a4237c942b3f414a788c18f29afeb490712e5fd
parent6901fe4853f93967ca0b8b6d1d3d7fe6e608bd93 (diff)
downloadFreeBSD-src-12b51b69b59bea2caedce712cb92b19326ced074.zip
FreeBSD-src-12b51b69b59bea2caedce712cb92b19326ced074.tar.gz
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
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
index 5836549..5523f62 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
@@ -429,7 +429,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
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);
}
OpenPOWER on IntegriCloud