Date: Fri, 5 Jun 2015 17:04:51 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r284033 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201506051704.t55H4pir018999@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Jun 5 17:04:50 2015 New Revision: 284033 URL: https://svnweb.freebsd.org/changeset/base/284033 Log: 5438 zfs_blkptr_verify should continue after zfs_panic_recover Author: Justin Gibbs <gibbs@scsiguy.com> Reviewed by: George Wilson <george@delphix.com> Reviewed by: Xin LI <delphij@freebsd.org> Approved by: Dan McDonald <danmcd@omniti.com> illumos/illumos-gate@5897eb49ccde82d19214b71984f57935e7e313d1 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Fri Jun 5 17:02:21 2015 (r284032) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zio.c Fri Jun 5 17:04:50 2015 (r284033) @@ -643,18 +643,20 @@ zfs_blkptr_verify(spa_t *spa, const blkp zfs_panic_recover("blkptr at %p DVA %u has invalid " "VDEV %llu", bp, i, (longlong_t)vdevid); + continue; } vdev_t *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) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506051704.t55H4pir018999>