shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

cleanup: move test for free arg

Browse Source 
Move test for list of volumes into common place.
This commit is contained in:
Zdenek Kabelac 2014-08-13 14:19:13 +02:00
parent 6872adc0ff
commit 338b991e40
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/lvconvert.c
View File

@ -110,8 +110,13 @@ static int _lvconvert_name_params(struct lvconvert_params *lp,
char *ptr; char *ptr;
const char *vg_name = NULL; const char *vg_name = NULL;
if (lp->merge) if (lp->merge) {
if (!*pargc) {
log_error("Please specify a logical volume path.");
return 0;
}
return 1; return 1;
}
if (!*pargc) { if (!*pargc) {
if (lp->cache) { if (lp->cache) {
@ -3317,14 +3322,9 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
if (lp.merge) { if (lp.merge)
if (!argc) {
log_error("Please provide logical volume path");
return EINVALID_CMD_LINE;
}
return process_each_lv(cmd, argc, argv, READ_FOR_UPDATE, &lp, return process_each_lv(cmd, argc, argv, READ_FOR_UPDATE, &lp,
&_lvconvert_merge_single); &_lvconvert_merge_single);
}
return lvconvert_single(cmd, &lp); return lvconvert_single(cmd, &lp);
} }