diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2016-01-29 17:20:59 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2016-01-29 17:20:59 +0000 |
| commit | 668e1ba140495113d5e872852322bc5fded82a43 (patch) | |
| tree | 7ad63862b3b484574d259c68165680ab86ef509b /cddl/contrib | |
| parent | d4b9233a9622d9b5a246124d7cf734ea7894a13d (diff) | |
| parent | 0fbf79a6b36fe6fb037fe53a038b547729a6ebda (diff) | |
| download | src-668e1ba140495113d5e872852322bc5fded82a43.tar.gz src-668e1ba140495113d5e872852322bc5fded82a43.zip | |
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
Notes
Notes:
svn path=/head/; revision=295047
Diffstat (limited to 'cddl/contrib')
| -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 d5ba20fde0cf..c3dafd6a777c 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); } |