diff options
| author | ahrens <none@none> | 2007-06-29 16:23:19 -0700 |
|---|---|---|
| committer | ahrens <none@none> | 2007-06-29 16:23:19 -0700 |
| commit | e7437265dc2a4920c197ed4337665539d358b22c (patch) | |
| tree | 9c7cdf5fccdef976501b70787140cd3fe7260a3e /usr/src/uts/common/fs/zfs/vdev.c | |
| parent | 5cb4fc8151d97cf08a87f2d1011efed091d169ea (diff) | |
| download | illumos-gate-e7437265dc2a4920c197ed4337665539d358b22c.tar.gz | |
PSARC/2007/328 zfs upgrade
6552536 'zpool status -v' doesn't work with new (type-bearing) directory entries
6559635 can not import pool whose front labels are gone
6572636 need "zfs upgrade" to change ZPL version number
6572637 store object type in directory entries.
6572648 ZPL's delete queue should not be processed if the filesystem is mounted read-only
6572650 ZFS_VERSION should be SPA_VERSION for readability
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c index 9269311cf4..84b0325f34 100644 --- a/usr/src/uts/common/fs/zfs/vdev.c +++ b/usr/src/uts/common/fs/zfs/vdev.c @@ -395,14 +395,14 @@ vdev_alloc(spa_t *spa, vdev_t **vdp, nvlist_t *nv, vdev_t *parent, uint_t id, * Older versions can only support 1 parity device. */ if (nparity == 2 && - spa_version(spa) < ZFS_VERSION_RAID6) + spa_version(spa) < SPA_VERSION_RAID6) return (ENOTSUP); } else { /* * We require the parity to be specified for SPAs that * support multiple parity levels. */ - if (spa_version(spa) >= ZFS_VERSION_RAID6) + if (spa_version(spa) >= SPA_VERSION_RAID6) return (EINVAL); /* * Otherwise, we default to 1 parity device for RAID-Z. @@ -1361,7 +1361,7 @@ vdev_validate_spare(vdev_t *vd) } if (nvlist_lookup_uint64(label, ZPOOL_CONFIG_VERSION, &version) != 0 || - version > ZFS_VERSION || + version > SPA_VERSION || nvlist_lookup_uint64(label, ZPOOL_CONFIG_GUID, &guid) != 0 || guid != vd->vdev_guid || nvlist_lookup_uint64(label, ZPOOL_CONFIG_POOL_STATE, &state) != 0) { |