svn commit: r246240 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Sat Feb  2 11:25:10 2013
New Revision: 246240
URL: http://svnweb.freebsd.org/changeset/base/246240

Log:
  MFC r245945: spa_generate_rootconf: add support for old vdev labels

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Feb  2 11:20:36 2013	(r246239)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Feb  2 11:25:10 2013	(r246240)
@@ -3775,9 +3775,8 @@ spa_generate_rootconf(const char *name)
 	/*
 	 * 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);