[Midnightbsd-cvs] src [8703] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c: spa_generate_rootconf: add support for old vdev labels

[laffer1 at midnightbsd.org]

Revision: 8703
          http://svnweb.midnightbsd.org/src/?rev=8703
Author:   laffer1
Date:     2016-09-25 18:16:48 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
spa_generate_rootconf: add support for old vdev labels

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	2016-09-25 22:16:23 UTC (rev 8702)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	2016-09-25 22:16:48 UTC (rev 8703)
@@ -3792,9 +3792,8 @@
 	/*
 	 * Multi-vdev root pool configuration discovery is not supported yet.
 	 */
-	nchildren = 0;
-	VERIFY(nvlist_lookup_uint64(best_cfg, ZPOOL_CONFIG_VDEV_CHILDREN,
-	    &nchildren) == 0);
+	nchildren = 1;
+	nvlist_lookup_uint64(best_cfg, ZPOOL_CONFIG_VDEV_CHILDREN, &nchildren);
 	holes = NULL;
 	nvlist_lookup_uint64_array(best_cfg, ZPOOL_CONFIG_HOLE_ARRAY,
 	    &holes, &nholes);