From ee3a23b84e7f635b9b32448909f1b780d0c156bf Mon Sep 17 00:00:00 2001 From: Justin Gibbs Date: Sat, 9 Jan 2016 18:29:05 +0100 Subject: [PATCH] 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 Reviewed by: George Wilson Reviewed by: Xin LI Approved by: Dan McDonald References: https://www.illumos.org/issues/5438 https://github.com/illumos/illumos-gate/commit/5897eb4 Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf --- module/zfs/zio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 9da7916e5b07..2d16e632de06 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) { /*