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

[Andriy Gapon]

Author: avg
Date: Tue Sep  6 06:09:12 2016
New Revision: 305456
URL: https://svnweb.freebsd.org/changeset/base/305456

Log:
  fix zfs pool creation accidentally broken by r305331
  
  The upstream change introduced a new load state, SPA_LOAD_CREATE,
  and vdev_geom code needs to be aware of it.
  
  Tested by:	cy
  MFC after:	1 week
  X-MFC with:	r305331

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Tue Sep  6 04:37:53 2016	(r305455)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Tue Sep  6 06:09:12 2016	(r305456)
@@ -777,7 +777,8 @@ vdev_geom_open(vdev_t *vd, uint64_t *psi
 
 	if (vd->vdev_spa->spa_splitting_newspa ||
 	    (vd->vdev_prevstate == VDEV_STATE_UNKNOWN &&
-	     vd->vdev_spa->spa_load_state == SPA_LOAD_NONE)) {
+	     vd->vdev_spa->spa_load_state == SPA_LOAD_NONE ||
+	     vd->vdev_spa->spa_load_state == SPA_LOAD_CREATE)) {
 		/*
 		 * We are dealing with a vdev that hasn't been previously
 		 * opened (since boot), and we are not loading an