diff options
| author | mav <mav@FreeBSD.org> | 2016-03-21 00:06:42 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-03-21 00:06:42 +0000 |
| commit | 343f418e75909aacc538e7c8a224fd834e3c843f (patch) | |
| tree | 52d0ddd03eb13e36bfb1fa085680a5971d6b9041 | |
| parent | be9d2c4881283a60df3c3ca0a20d6fdbe139c044 (diff) | |
| download | FreeBSD-src-343f418e75909aacc538e7c8a224fd834e3c843f.zip FreeBSD-src-343f418e75909aacc538e7c8a224fd834e3c843f.tar.gz | |
MFC r295047: 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
| -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); } |
