diff options
| author | mav <mav@FreeBSD.org> | 2016-10-14 07:42:53 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-10-14 07:42:53 +0000 |
| commit | e7aa8c49b89e5c2c08a3dfc5f2fec2a1b08a25f9 (patch) | |
| tree | 3fa8ce400b24e612ec8339816b5967dff3c1f59d /sys/cddl | |
| parent | a943c7c7718b66334020569126a38a26d9d08cd2 (diff) | |
| download | FreeBSD-src-e7aa8c49b89e5c2c08a3dfc5f2fec2a1b08a25f9.zip FreeBSD-src-e7aa8c49b89e5c2c08a3dfc5f2fec2a1b08a25f9.tar.gz | |
MFC r305456 (by avg): 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.
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 077983c..818052b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -777,7 +777,8 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize, 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 |
