diff options
| author | Dan Vatca <dan.vatca@gmail.com> | 2015-12-02 17:50:28 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-12-02 14:56:44 -0500 |
| commit | b289d045e084af53efcc025255af8242e41f28fa (patch) | |
| tree | 6384ad303a2ed2f4eaa8b1f62d5284f37b116185 /usr/src/lib/libzfs/common/libzfs_config.c | |
| parent | cbff3abd8ecaa7b8e6a47457e0a5e562dbfc2cad (diff) | |
| download | illumos-gate-b289d045e084af53efcc025255af8242e41f28fa.tar.gz | |
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>
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_config.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_config.c b/usr/src/lib/libzfs/common/libzfs_config.c index d5ba20fde0..c3dafd6a77 100644 --- a/usr/src/lib/libzfs/common/libzfs_config.c +++ b/usr/src/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); } |