summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2015-11-06 20:45:19 +0000
committersmh <smh@FreeBSD.org>2015-11-06 20:45:19 +0000
commit6ee330f6083ae499249c2047899e176c08fd2517 (patch)
tree9b1534ed23e778e5eab45f067d6ac36af3a92016 /sys/cddl
parentef848af003065d41aa87c917f8c95de652204ab9 (diff)
downloadFreeBSD-src-6ee330f6083ae499249c2047899e176c08fd2517.zip
FreeBSD-src-6ee330f6083ae499249c2047899e176c08fd2517.tar.gz
Switch zfs_panic_recover to panic for bad DVA
As reported by Coverity a null pointer de-reference panic would be triggered when zfs_recover was set so switch to straight panic as it can never be recovered. Reported by: Coverity Scan MFC after: 1 X-MFC-With: r290401 Sponsored by: Multiplay
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
index 026dd50..1aa566c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
@@ -1838,7 +1838,7 @@ dva_get_dsize_sync(spa_t *spa, const dva_t *dva)
uint64_t vdev = DVA_GET_VDEV(dva);
vdev_t *vd = vdev_lookup_top(spa, vdev);
if (vd == NULL) {
- zfs_panic_recover(
+ panic(
"dva_get_dsize_sync(): bad DVA %llu:%llu",
(u_longlong_t)vdev, (u_longlong_t)asize);
}
OpenPOWER on IntegriCloud