c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add add_prop_list_default helper

Browse Source 
Adding to a property list only if there is no existing value is used
twice. Once by zpool create -R and again by zpool import -R. Now that
zpool create -t and zpool import -t also need it, lets refactor it into
a helper function to make the code more readable.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2417
This commit is contained in:
Richard Yao 2014-06-23 14:12:53 -04:00 committed by Brian Behlendorf
parent aa0ac7caa4
commit 2f3ec90061
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/zpool/zpool_main.c
View File

@ -485,6 +485,21 @@ add_prop_list(const char *propname, char *propval, nvlist_t **props,
return (0); return (0);
} }
/*
* Set a default property pair (name, string-value) in a property nvlist
*/
static int
add_prop_list_default(const char *propname, char *propval, nvlist_t **props,
boolean_t poolprop)
{
char *pval;
if (nvlist_lookup_string(*props, propname, &pval) == 0)
return (0);
return (add_prop_list(propname, propval, props, B_TRUE));
}
/* /*
* zpool add [-fn] [-o property=value] <pool> <vdev> ... * zpool add [-fn] [-o property=value] <pool> <vdev> ...
* *
@ -823,11 +838,7 @@ zpool_do_create(int argc, char **argv)
if (add_prop_list(zpool_prop_to_name( if (add_prop_list(zpool_prop_to_name(
ZPOOL_PROP_ALTROOT), optarg, &props, B_TRUE)) ZPOOL_PROP_ALTROOT), optarg, &props, B_TRUE))
goto errout; goto errout;
if (nvlist_lookup_string(props, if (add_prop_list_default(zpool_prop_to_name(
zpool_prop_to_name(ZPOOL_PROP_CACHEFILE),
&propval) == 0)
break;
if (add_prop_list(zpool_prop_to_name(
ZPOOL_PROP_CACHEFILE), "none", &props, B_TRUE)) ZPOOL_PROP_CACHEFILE), "none", &props, B_TRUE))
goto errout; goto errout;
break; break;
@ -2068,11 +2079,7 @@ zpool_do_import(int argc, char **argv)
if (add_prop_list(zpool_prop_to_name( if (add_prop_list(zpool_prop_to_name(
ZPOOL_PROP_ALTROOT), optarg, &props, B_TRUE)) ZPOOL_PROP_ALTROOT), optarg, &props, B_TRUE))
goto error; goto error;
if (nvlist_lookup_string(props, if (add_prop_list_default(zpool_prop_to_name(
zpool_prop_to_name(ZPOOL_PROP_CACHEFILE),
&propval) == 0)
break;
if (add_prop_list(zpool_prop_to_name(
ZPOOL_PROP_CACHEFILE), "none", &props, B_TRUE)) ZPOOL_PROP_CACHEFILE), "none", &props, B_TRUE))
goto error; goto error;
break; break;