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/lib/libzfs/common/libzfs_pool.c | |
| parent | 5cb4fc8151d97cf08a87f2d1011efed091d169ea (diff) | |
| download | illumos-joyent-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/lib/libzfs/common/libzfs_pool.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_pool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_pool.c b/usr/src/lib/libzfs/common/libzfs_pool.c index 9c1d197f4d..daf435126a 100644 --- a/usr/src/lib/libzfs/common/libzfs_pool.c +++ b/usr/src/lib/libzfs/common/libzfs_pool.c @@ -534,7 +534,7 @@ zpool_add(zpool_handle_t *zhp, nvlist_t *nvroot) (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, "cannot add to '%s'"), zhp->zpool_name); - if (zpool_get_version(zhp) < ZFS_VERSION_SPARES && + if (zpool_get_version(zhp) < SPA_VERSION_SPARES && nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES, &spares, &nspares) == 0) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "pool must be " @@ -2183,7 +2183,7 @@ zpool_set_prop(zpool_handle_t *zhp, const char *propname, const char *propval) dgettext(TEXT_DOMAIN, "cannot set property for '%s'"), zhp->zpool_name); - if (zpool_get_version(zhp) < ZFS_VERSION_BOOTFS) { + if (zpool_get_version(zhp) < SPA_VERSION_BOOTFS) { zfs_error_aux(zhp->zpool_hdl, dgettext(TEXT_DOMAIN, "pool must be " "upgraded to support pool properties")); @@ -2230,7 +2230,7 @@ zpool_get_prop_int(zpool_handle_t *zhp, zpool_prop_t prop) uint64_t value; nvlist_t *nvp; - if (zpool_get_version(zhp) < ZFS_VERSION_BOOTFS) + if (zpool_get_version(zhp) < SPA_VERSION_BOOTFS) return (0); if (zhp->zpool_props == NULL && zpool_get_all_props(zhp)) @@ -2267,7 +2267,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *propbuf, (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN, "cannot get property '%s'"), zpool_prop_to_name(prop)); - if (zpool_get_version(zhp) < ZFS_VERSION_BOOTFS) { + if (zpool_get_version(zhp) < SPA_VERSION_BOOTFS) { zfs_error_aux(zhp->zpool_hdl, dgettext(TEXT_DOMAIN, "pool must be " "upgraded to support pool properties")); |