svn commit: r284033 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Andriy Gapon]

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 at scsiguy.com>
  Reviewed by: George Wilson <george at delphix.com>
  Reviewed by: Xin LI <delphij at freebsd.org>
  Approved by: Dan McDonald <danmcd at omniti.com>
  
  illumos/illumos-gate at 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) {
 			/*