[Midnightbsd-cvs] src [8480] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c: init ub_version before calling spa_config_parse

[laffer1 at midnightbsd.org]

Revision: 8480
          http://svnweb.midnightbsd.org/src/?rev=8480
Author:   laffer1
Date:     2016-09-18 18:29:41 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
init ub_version before calling spa_config_parse

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-18 22:29:19 UTC (rev 8479)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	2016-09-18 22:29:41 UTC (rev 8480)
@@ -3839,6 +3839,14 @@
 			spa_remove(spa);
 		}
 		spa = spa_add(pname, config, NULL);
+
+		/*
+		 * Set spa_ubsync.ub_version as it can be used in vdev_alloc()
+		 * via spa_version().
+		 */
+		if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
+		    &spa->spa_ubsync.ub_version) != 0)
+			spa->spa_ubsync.ub_version = SPA_VERSION_INITIAL;
 	} else if ((spa = spa_lookup(name)) == NULL) {
 		cmn_err(CE_NOTE, "Cannot find the pool label for '%s'",
 		    name);