summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-01-23 22:46:07 +0000
committerdelphij <delphij@FreeBSD.org>2015-01-23 22:46:07 +0000
commitae11365e35a8faa087336848bdb52f9f6c252ff1 (patch)
tree332dd6c7a4cde976c62e3fe43c8209ea715b9768
parente878593535399133ac6fe7417003498e05f570e1 (diff)
downloadFreeBSD-src-ae11365e35a8faa087336848bdb52f9f6c252ff1.zip
FreeBSD-src-ae11365e35a8faa087336848bdb52f9f6c252ff1.tar.gz
MFC r275923:
Add missing continue: we can't proceed further if the kernel does not panic with zfs_panic_recover. Illumos issue: 5438 zfs_blkptr_verify should continue after zfs_panic_recover Reported by: Coverity CID: 1232014
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
index f53457c..1df2c9b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
@@ -706,18 +706,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;
}
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) {
/*
OpenPOWER on IntegriCloud