svn commit: r295047 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Fri Jan 29 17:20:59 2016
New Revision: 295047
URL: https://svnweb.freebsd.org/changeset/base/295047

Log:
  MFV 295046: 6358 A faulted pool with only unavailable vdevs triggers
  assertion failure in libzfs
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Andrew Stormont <andyjstormont at gmail.com>
  Reviewed by: Serban Maduta <serban.maduta at gmail.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Dan Vatca <dan.vatca at gmail.com>
  
  illumos/illumos-gate at b289d045e084af53efcc025255af8242e41f28fa

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Fri Jan 29 17:18:50 2016	(r295046)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Fri Jan 29 17:20:59 2016	(r295047)
@@ -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);
 }