diff options
| -rw-r--r-- | tools/toollib.c | 10 | ||||
| -rw-r--r-- | tools/toollib.h | 7 | ||||
| -rw-r--r-- | tools/vgcreate.c | 3 | ||||
| -rw-r--r-- | tools/vgsplit.c | 3 |
4 files changed, 12 insertions, 11 deletions
diff --git a/tools/toollib.c b/tools/toollib.c index 6d9b3b28..39a6d697 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1204,16 +1204,16 @@ void vgcreate_params_set_defaults(struct vgcreate_params *vp_def, } /* - * Set members of struct vgcreate_params from cmdline. + * Set members of struct vgcreate_params from cmdline arguments. * Do preliminary validation with arg_*() interface. * Further, more generic validation is done in validate_vgcreate_params(). * This function is to remain in tools directory. */ -int fill_vg_create_params(struct cmd_context *cmd, - char *vg_name, struct vgcreate_params *vp_new, - struct vgcreate_params *vp_def) +int vgcreate_params_set_from_args(struct cmd_context *cmd, + struct vgcreate_params *vp_new, + struct vgcreate_params *vp_def) { - vp_new->vg_name = skip_dev_dir(cmd, vg_name, NULL); + vp_new->vg_name = skip_dev_dir(cmd, vp_def->vg_name, NULL); vp_new->max_lv = arg_uint_value(cmd, maxlogicalvolumes_ARG, vp_def->max_lv); vp_new->max_pv = arg_uint_value(cmd, maxphysicalvolumes_ARG, diff --git a/tools/toollib.h b/tools/toollib.h index e6b08d28..4743fd59 100644 --- a/tools/toollib.h +++ b/tools/toollib.h @@ -101,10 +101,9 @@ int is_reserved_lvname(const char *name); void vgcreate_params_set_defaults(struct vgcreate_params *vp_def, struct volume_group *vg); -int fill_vg_create_params(struct cmd_context *cmd, - char *vg_name, struct vgcreate_params *vp_new, - struct vgcreate_params *vp_def); - +int vgcreate_params_set_from_args(struct cmd_context *cmd, + struct vgcreate_params *vp_new, + struct vgcreate_params *vp_def); int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv); int vg_refresh_visible(struct cmd_context *cmd, struct volume_group *vg); void lv_spawn_background_polling(struct cmd_context *cmd, diff --git a/tools/vgcreate.c b/tools/vgcreate.c index 39b6e6e1..0e916387 100644 --- a/tools/vgcreate.c +++ b/tools/vgcreate.c @@ -46,7 +46,8 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) } vgcreate_params_set_defaults(&vp_def, NULL); - if (fill_vg_create_params(cmd, vg_name, &vp_new, &vp_def)) + vp_def.vg_name = vg_name; + if (vgcreate_params_set_from_args(cmd, &vp_new, &vp_def)) return EINVALID_CMD_LINE; if (validate_vg_create_params(cmd, &vp_new)) diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 4f0691b7..a56b7c54 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -367,7 +367,8 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) goto_bad; } else { vgcreate_params_set_defaults(&vp_def, vg_from); - if (fill_vg_create_params(cmd, vg_name_to, &vp_new, &vp_def)) { + vp_def.vg_name = vg_name_to; + if (vgcreate_params_set_from_args(cmd, &vp_new, &vp_def)) { r = EINVALID_CMD_LINE; goto_bad; } |