diff options
author | avg <avg@FreeBSD.org> | 2014-02-17 18:25:41 +0000 |
---|---|---|
committer | avg <avg@FreeBSD.org> | 2014-02-17 18:25:41 +0000 |
commit | 489e9199469312bfa8a4485ea401738f13296942 (patch) | |
tree | 023e997449769dd55a53ddb51d21497877551fda /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c | |
parent | b0a412937022eafe8c2d5bbc56abe56fd7b1b098 (diff) | |
download | FreeBSD-src-489e9199469312bfa8a4485ea401738f13296942.zip FreeBSD-src-489e9199469312bfa8a4485ea401738f13296942.tar.gz |
MFC r260185: MFV r260155: 4391 panic system rather than corrupting pool if we hit bug 4390
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c')
-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 a0ca63f..26bd28d 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 @@ -361,7 +361,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp, (void) arc_buf_remove_ref(buf, &buf); post: - if (err == 0 && lasterr == 0 && (td->td_flags & TRAVERSE_POST)) { + if (err == 0 && (td->td_flags & TRAVERSE_POST)) { err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg); if (err == ERESTART) pause = B_TRUE; |