Author: mav Date: Fri Jan 29 17:18:50 2016 New Revision: 295046 URL: https://svnweb.freebsd.org/changeset/base/295046
Log: 6358 A faulted pool with only unavailable vdevs triggers assertion failure in libzfs Reviewed by: Matthew Ahrens <[email protected]> Reviewed by: Andrew Stormont <[email protected]> Reviewed by: Serban Maduta <[email protected]> Approved by: Dan McDonald <[email protected]> Author: Dan Vatca <[email protected]> illumos/illumos-gate@b289d045e084af53efcc025255af8242e41f28fa Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_config.c Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_config.c ============================================================================== --- vendor/illumos/dist/lib/libzfs/common/libzfs_config.c Fri Jan 29 17:08:26 2016 (r295045) +++ vendor/illumos/dist/lib/libzfs/common/libzfs_config.c Fri Jan 29 17:18:50 2016 (r295046) @@ -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); } _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
