diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-09-28 13:07:18 +0200 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2014-10-01 11:31:30 -0500 |
commit | c6df5570930f3d4b1c1b66661bfbba478ffd28fd (patch) | |
tree | 149e00f0bb6cd72c8e93be938d37d472399a480c | |
parent | 372a88626ab692b0e81147f884197a4762a59ab0 (diff) | |
download | lvm2-dev-dct-process-v26.tar.gz |
lvconvert: switch to validate_lvname_paramdev-dct-process-v26
Use new toollib function for validation.
-rw-r--r-- | tools/lvconvert.c | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 28a3526fd..c05ea1b82 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -72,37 +72,6 @@ struct lvconvert_params { thin_discards_t discards; }; -static int _lvconvert_vg_name(struct lvconvert_params *lp, - struct cmd_context *cmd, - const char **lv_name) -{ - const char *vg_name; - const char *tmp_str; - - if (!lv_name || !*lv_name) - return 1; - - /* If contains VG name, extract it. */ - if ((tmp_str = strchr(*lv_name, (int) '/'))) { - if (!(vg_name = extract_vgname(cmd, *lv_name))) - return_0; - if (!lp->vg_name) - lp->vg_name = vg_name; - else if (strcmp(vg_name, lp->vg_name)) { - log_error("Please use a single volume group name " - "(\"%s\" or \"%s\")", vg_name, lp->vg_name); - return 0; - } - /* Strip VG from lv_name */ - *lv_name = tmp_str + 1; - } - - if (!apply_lvname_restrictions(*lv_name)) - return_0; - - return 1; -} - static int _lvconvert_name_params(struct lvconvert_params *lp, struct cmd_context *cmd, int *pargc, char ***pargv) @@ -142,16 +111,16 @@ static int _lvconvert_name_params(struct lvconvert_params *lp, (*pargv)++, (*pargc)--; } - if (!_lvconvert_vg_name(lp, cmd, &lp->pool_metadata_lv_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_metadata_lv_name)) return_0; - if (!_lvconvert_vg_name(lp, cmd, &lp->pool_data_lv_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_data_lv_name)) return_0; - if (!_lvconvert_vg_name(lp, cmd, &lp->origin_lv_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_lv_name)) return_0; - if (!_lvconvert_vg_name(lp, cmd, &lp->lv_split_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_split_name)) return_0; if (strchr(lp->lv_name_full, '/') && |