aboutsummaryrefslogtreecommitdiff
path: root/sys/cddl
diff options
context:
space:
mode:
authorSteven Hartland <smh@FreeBSD.org>2015-11-06 20:45:19 +0000
committerSteven Hartland <smh@FreeBSD.org>2015-11-06 20:45:19 +0000
commit465fed1c17fadb67c91292bfeda948ed16bc0523 (patch)
tree9b1534ed23e778e5eab45f067d6ac36af3a92016 /sys/cddl
parentb34e5f2e07f926218ea1ff0628a438b227fdd4ef (diff)
downloadsrc-465fed1c17fadb67c91292bfeda948ed16bc0523.tar.gz
src-465fed1c17fadb67c91292bfeda948ed16bc0523.zip
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
Notes
Notes: svn path=/head/; revision=290466
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 026dd5015a25..1aa566c7d036 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);
}