[SRU,XENIAL] UBUNTU: SAUCE: (noup) Update zfs to 0.6.5.6-0ubuntu26

Message ID 20181010133504.5080-1-colin.king@canonical.com
State New
Headers show
Series
  • [SRU,XENIAL] UBUNTU: SAUCE: (noup) Update zfs to 0.6.5.6-0ubuntu26
Related show

Commit Message

Colin King Oct. 10, 2018, 1:35 p.m.
From: Colin Ian King <colin.king@canonical.com>

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: Colin Ian King <colin.king@canonical.com>
---
 zfs/META                   |  2 +-
 zfs/module/zfs/zfs_ioctl.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

Comments

Stefan Bader Oct. 11, 2018, 7:50 a.m. | #1
On 10.10.2018 15:35, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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: Colin Ian King <colin.king@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  zfs/META                   |  2 +-
>  zfs/module/zfs/zfs_ioctl.c | 10 ++++++++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/zfs/META b/zfs/META
> index 2be5169..0ec36d1 100644
> --- a/zfs/META
> +++ b/zfs/META
> @@ -2,7 +2,7 @@ Meta:         1
>  Name:         zfs
>  Branch:       1.0
>  Version:      0.6.5.6
> -Release:      0ubuntu25
> +Release:      0ubuntu26
>  Release-Tags: relext
>  License:      CDDL
>  Author:       OpenZFS on Linux
> diff --git a/zfs/module/zfs/zfs_ioctl.c b/zfs/module/zfs/zfs_ioctl.c
> index 745f713..1227d3e 100644
> --- a/zfs/module/zfs/zfs_ioctl.c
> +++ b/zfs/module/zfs/zfs_ioctl.c
> @@ -1438,6 +1438,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	nvlist_t *config, *props = NULL;
>  	nvlist_t *rootprops = NULL;
>  	nvlist_t *zplprops = NULL;
> +	char *spa_name = zc->zc_name;
>  
>  	if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
>  	    zc->zc_iflags, &config)))
> @@ -1453,6 +1454,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	if (props) {
>  		nvlist_t *nvl = NULL;
>  		uint64_t version = SPA_VERSION;
> +		char *tname;
>  
>  		(void) nvlist_lookup_uint64(props,
>  		    zpool_prop_to_name(ZPOOL_PROP_VERSION), &version);
> @@ -1475,6 +1477,10 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  		    zplprops, NULL);
>  		if (error != 0)
>  			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);
> @@ -1482,9 +1488,9 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	/*
>  	 * 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)
> -		(void) spa_destroy(zc->zc_name);
> +		(void) spa_destroy(spa_name);
>  
>  pool_props_bad:
>  	nvlist_free(rootprops);
>
Khaled Elmously Oct. 11, 2018, 9:03 a.m. | #2
On 2018-10-10 14:35:04 , Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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: Colin Ian King <colin.king@canonical.com>
> ---
>  zfs/META                   |  2 +-
>  zfs/module/zfs/zfs_ioctl.c | 10 ++++++++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/zfs/META b/zfs/META
> index 2be5169..0ec36d1 100644
> --- a/zfs/META
> +++ b/zfs/META
> @@ -2,7 +2,7 @@ Meta:         1
>  Name:         zfs
>  Branch:       1.0
>  Version:      0.6.5.6
> -Release:      0ubuntu25
> +Release:      0ubuntu26
>  Release-Tags: relext
>  License:      CDDL
>  Author:       OpenZFS on Linux
> diff --git a/zfs/module/zfs/zfs_ioctl.c b/zfs/module/zfs/zfs_ioctl.c
> index 745f713..1227d3e 100644
> --- a/zfs/module/zfs/zfs_ioctl.c
> +++ b/zfs/module/zfs/zfs_ioctl.c
> @@ -1438,6 +1438,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	nvlist_t *config, *props = NULL;
>  	nvlist_t *rootprops = NULL;
>  	nvlist_t *zplprops = NULL;
> +	char *spa_name = zc->zc_name;
>  
>  	if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
>  	    zc->zc_iflags, &config)))
> @@ -1453,6 +1454,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	if (props) {
>  		nvlist_t *nvl = NULL;
>  		uint64_t version = SPA_VERSION;
> +		char *tname;
>  
>  		(void) nvlist_lookup_uint64(props,
>  		    zpool_prop_to_name(ZPOOL_PROP_VERSION), &version);
> @@ -1475,6 +1477,10 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  		    zplprops, NULL);
>  		if (error != 0)
>  			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);
> @@ -1482,9 +1488,9 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	/*
>  	 * 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)
> -		(void) spa_destroy(zc->zc_name);
> +		(void) spa_destroy(spa_name);
>  
>  pool_props_bad:
>  	nvlist_free(rootprops);

Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Kleber Souza Oct. 19, 2018, 2:54 p.m. | #3
On 10/10/18 15:35, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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: Colin Ian King <colin.king@canonical.com>
> ---
>  zfs/META                   |  2 +-
>  zfs/module/zfs/zfs_ioctl.c | 10 ++++++++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/zfs/META b/zfs/META
> index 2be5169..0ec36d1 100644
> --- a/zfs/META
> +++ b/zfs/META
> @@ -2,7 +2,7 @@ Meta:         1
>  Name:         zfs
>  Branch:       1.0
>  Version:      0.6.5.6
> -Release:      0ubuntu25
> +Release:      0ubuntu26
>  Release-Tags: relext
>  License:      CDDL
>  Author:       OpenZFS on Linux
> diff --git a/zfs/module/zfs/zfs_ioctl.c b/zfs/module/zfs/zfs_ioctl.c
> index 745f713..1227d3e 100644
> --- a/zfs/module/zfs/zfs_ioctl.c
> +++ b/zfs/module/zfs/zfs_ioctl.c
> @@ -1438,6 +1438,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	nvlist_t *config, *props = NULL;
>  	nvlist_t *rootprops = NULL;
>  	nvlist_t *zplprops = NULL;
> +	char *spa_name = zc->zc_name;
>  
>  	if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
>  	    zc->zc_iflags, &config)))
> @@ -1453,6 +1454,7 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	if (props) {
>  		nvlist_t *nvl = NULL;
>  		uint64_t version = SPA_VERSION;
> +		char *tname;
>  
>  		(void) nvlist_lookup_uint64(props,
>  		    zpool_prop_to_name(ZPOOL_PROP_VERSION), &version);
> @@ -1475,6 +1477,10 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  		    zplprops, NULL);
>  		if (error != 0)
>  			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);
> @@ -1482,9 +1488,9 @@ zfs_ioc_pool_create(zfs_cmd_t *zc)
>  	/*
>  	 * 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)
> -		(void) spa_destroy(zc->zc_name);
> +		(void) spa_destroy(spa_name);
>  
>  pool_props_bad:
>  	nvlist_free(rootprops);
> 

Applied to xenial/master-next branch.

Thanks,
Kleber

Patch

diff --git a/zfs/META b/zfs/META
index 2be5169..0ec36d1 100644
--- a/zfs/META
+++ b/zfs/META
@@ -2,7 +2,7 @@  Meta:         1
 Name:         zfs
 Branch:       1.0
 Version:      0.6.5.6
-Release:      0ubuntu25
+Release:      0ubuntu26
 Release-Tags: relext
 License:      CDDL
 Author:       OpenZFS on Linux
diff --git a/zfs/module/zfs/zfs_ioctl.c b/zfs/module/zfs/zfs_ioctl.c
index 745f713..1227d3e 100644
--- a/zfs/module/zfs/zfs_ioctl.c
+++ b/zfs/module/zfs/zfs_ioctl.c
@@ -1438,6 +1438,7 @@  zfs_ioc_pool_create(zfs_cmd_t *zc)
 	nvlist_t *config, *props = NULL;
 	nvlist_t *rootprops = NULL;
 	nvlist_t *zplprops = NULL;
+	char *spa_name = zc->zc_name;
 
 	if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
 	    zc->zc_iflags, &config)))
@@ -1453,6 +1454,7 @@  zfs_ioc_pool_create(zfs_cmd_t *zc)
 	if (props) {
 		nvlist_t *nvl = NULL;
 		uint64_t version = SPA_VERSION;
+		char *tname;
 
 		(void) nvlist_lookup_uint64(props,
 		    zpool_prop_to_name(ZPOOL_PROP_VERSION), &version);
@@ -1475,6 +1477,10 @@  zfs_ioc_pool_create(zfs_cmd_t *zc)
 		    zplprops, NULL);
 		if (error != 0)
 			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);
@@ -1482,9 +1488,9 @@  zfs_ioc_pool_create(zfs_cmd_t *zc)
 	/*
 	 * 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)
-		(void) spa_destroy(zc->zc_name);
+		(void) spa_destroy(spa_name);
 
 pool_props_bad:
 	nvlist_free(rootprops);