diff options
| author | mav <mav@FreeBSD.org> | 2016-10-14 07:43:28 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-10-14 07:43:28 +0000 |
| commit | 5329a3ac7319f1769eafe7eb97255278279a1ce1 (patch) | |
| tree | 04f11ae897149d8116f61826d750c2d3baa88858 | |
| parent | 0504468b1f136e7dbc17ed6602c4abd75255fb0c (diff) | |
| download | FreeBSD-src-5329a3ac7319f1769eafe7eb97255278279a1ce1.zip FreeBSD-src-5329a3ac7319f1769eafe7eb97255278279a1ce1.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.
| -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 0ac5fb7..ac994f5 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 @@ -730,7 +730,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 |
