Commit e36f5a11 authored by Colin Ian King's avatar Colin Ian King Committed by Kleber Sacilotto de Souza

UBUNTU: SAUCE: (noup) Update zfs to 0.6.5.6-0ubuntu26

BugLink: https://bugs.launchpad.net/bugs/1769937

Sync with zfsutils-linux 0.6.5.6-0ubuntu26 to pick up fixes for
LP#1769937.

Upstream ZFS fix 4ceb8dd6fdfd ("Fix 'zpool create -t <tempname>'")
fixes error message and error exit when using the -t option
when creating a pool.
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 7f6ec17e
...@@ -2,7 +2,7 @@ Meta: 1 ...@@ -2,7 +2,7 @@ Meta: 1
Name: zfs Name: zfs
Branch: 1.0 Branch: 1.0
Version: 0.6.5.6 Version: 0.6.5.6
Release: 0ubuntu25 Release: 0ubuntu26
Release-Tags: relext Release-Tags: relext
License: CDDL License: CDDL
Author: OpenZFS on Linux Author: OpenZFS on Linux
...@@ -1438,6 +1438,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc) ...@@ -1438,6 +1438,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
nvlist_t *config, *props = NULL; nvlist_t *config, *props = NULL;
nvlist_t *rootprops = NULL; nvlist_t *rootprops = NULL;
nvlist_t *zplprops = NULL; nvlist_t *zplprops = NULL;
char *spa_name = zc->zc_name;
if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size, if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
zc->zc_iflags, &config))) zc->zc_iflags, &config)))
...@@ -1453,6 +1454,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc) ...@@ -1453,6 +1454,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
if (props) { if (props) {
nvlist_t *nvl = NULL; nvlist_t *nvl = NULL;
uint64_t version = SPA_VERSION; uint64_t version = SPA_VERSION;
char *tname;
(void) nvlist_lookup_uint64(props, (void) nvlist_lookup_uint64(props,
zpool_prop_to_name(ZPOOL_PROP_VERSION), &version); zpool_prop_to_name(ZPOOL_PROP_VERSION), &version);
...@@ -1475,6 +1477,10 @@ zfs_ioc_pool_create(zfs_cmd_t *zc) ...@@ -1475,6 +1477,10 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
zplprops, NULL); zplprops, NULL);
if (error != 0) if (error != 0)
goto pool_props_bad; goto pool_props_bad;
if (nvlist_lookup_string(props,
zpool_prop_to_name(ZPOOL_PROP_TNAME), &tname) == 0)
spa_name = tname;
} }
error = spa_create(zc->zc_name, config, props, zplprops); error = spa_create(zc->zc_name, config, props, zplprops);
...@@ -1482,9 +1488,9 @@ zfs_ioc_pool_create(zfs_cmd_t *zc) ...@@ -1482,9 +1488,9 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
/* /*
* Set the remaining root properties * Set the remaining root properties
*/ */
if (!error && (error = zfs_set_prop_nvlist(zc->zc_name, if (!error && (error = zfs_set_prop_nvlist(spa_name,
ZPROP_SRC_LOCAL, rootprops, NULL)) != 0) ZPROP_SRC_LOCAL, rootprops, NULL)) != 0)
(void) spa_destroy(zc->zc_name); (void) spa_destroy(spa_name);
pool_props_bad: pool_props_bad:
nvlist_free(rootprops); nvlist_free(rootprops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment