svn commit: r245945 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Sat Jan 26 10:34:17 2013
New Revision: 245945
URL: http://svnweb.freebsd.org/changeset/base/245945

Log:
  spa_generate_rootconf: add support for old vdev labels
  
  It seems that old ZFS versions (v15) completely omit "vdev_children"
  property when there is a single child.
  
  Reported by:	jase
  Tested by:	jase
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Jan 26 09:56:06 2013	(r245944)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Jan 26 10:34:17 2013	(r245945)
@@ -3792,9 +3792,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);