diff options
| author | mav <mav@FreeBSD.org> | 2016-01-29 17:20:59 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-01-29 17:20:59 +0000 |
| commit | e0bef7b56ab0c598635299782cf1a502c6605ef1 (patch) | |
| tree | 7ad63862b3b484574d259c68165680ab86ef509b /cddl | |
| parent | 94b986ee45d924260f255854d8022435a559b674 (diff) | |
| download | FreeBSD-src-e0bef7b56ab0c598635299782cf1a502c6605ef1.zip FreeBSD-src-e0bef7b56ab0c598635299782cf1a502c6605ef1.tar.gz | |
MFV 295046: 6358 A faulted pool with only unavailable vdevs triggers
assertion failure in libzfs
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Serban Maduta <serban.maduta@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Dan Vatca <dan.vatca@gmail.com>
illumos/illumos-gate@b289d045e084af53efcc025255af8242e41f28fa
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c index d5ba20f..c3dafd6 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2015 by Syneto S.R.L. All rights reserved. */ /* @@ -246,8 +247,9 @@ zpool_get_features(zpool_handle_t *zhp) config = zpool_get_config(zhp, NULL); } - verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS, - &features) == 0); + if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS, + &features) != 0) + return (NULL); return (features); } |
