diff options
author | delphij <delphij@FreeBSD.org> | 2015-01-23 17:16:26 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2015-01-23 17:16:26 +0000 |
commit | 29c471fa7a1effe0109b18e7b85fe1c222c5c1a4 (patch) | |
tree | 5ff34f78d6d1ba79667a5af9875505d0ff84e0dd | |
parent | 227bb2b2ea01be5c73785d6cd7fd96443e7c0bb0 (diff) | |
download | FreeBSD-src-29c471fa7a1effe0109b18e7b85fe1c222c5c1a4.zip FreeBSD-src-29c471fa7a1effe0109b18e7b85fe1c222c5c1a4.tar.gz |
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
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c | 2 |
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); } |