Date: Mon, 21 Mar 2016 00:06:42 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r297105 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common Message-ID: <201603210006.u2L06gPY031846@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Mar 21 00:06:42 2016 New Revision: 297105 URL: https://svnweb.freebsd.org/changeset/base/297105 Log: 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 Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c Mon Mar 21 00:04:53 2016 (r297104) +++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c Mon Mar 21 00:06:42 2016 (r297105) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603210006.u2L06gPY031846>