diff options
author | Justin Gibbs <[email protected]> | 2016-01-09 18:29:05 +0100 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2016-01-12 13:54:05 -0800 |
commit | ee3a23b84e7f635b9b32448909f1b780d0c156bf (patch) | |
tree | e45e25af4cc01947f50576bfb47347dd64692d4a /module | |
parent | fc581e05072c21d82729091ebe34248fd0777460 (diff) |
Illumos 5438 - zfs_blkptr_verify should continue after zfs_panic_recover
5438 zfs_blkptr_verify should continue after zfs_panic_recover
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Xin LI <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/5438
https://github.com/illumos/illumos-gate/commit/5897eb4
Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module')
-rw-r--r-- | module/zfs/zio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 9da7916e5..2d16e632d 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -679,18 +679,20 @@ zfs_blkptr_verify(spa_t *spa, const blkptr_t *bp) zfs_panic_recover("blkptr at %p DVA %u has invalid " "VDEV %llu", bp, i, (longlong_t)vdevid); + continue; } vd = spa->spa_root_vdev->vdev_child[vdevid]; if (vd == NULL) { zfs_panic_recover("blkptr at %p DVA %u has invalid " "VDEV %llu", bp, i, (longlong_t)vdevid); + continue; } if (vd->vdev_ops == &vdev_hole_ops) { zfs_panic_recover("blkptr at %p DVA %u has hole " "VDEV %llu", bp, i, (longlong_t)vdevid); - + continue; } if (vd->vdev_ops == &vdev_missing_ops) { /* |