shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-17 06:04:23 +03:00
Code Releases Activity

commands: support shortcut -H for cache objects

Browse Source 
Introduce cache_long_ARG for those instancies
where --cache is not related to caching LV.
(pvchange,vg|lv|pvscan).

cache_ARG is now with -H shortcut.
This commit is contained in:
Zdenek Kabelac 2014-09-29 20:43:11 +02:00
parent 1a6c892864
commit fc77e4291b
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.112 -
=====================================
Option --cache has also shortcut -H (i.e. lvcreate -H).
Refactor lvcreate code and better preserve --type argument.
Refactor process_each_vg in toollib.
Pools cannot be used as external origin.

3
tools/args.h
View File

@ -63,7 +63,7 @@ arg(merge_ARG, '\0', "merge", NULL, 0)
arg(monitor_ARG, '\0', "monitor", yes_no_arg, 0)
arg(config_ARG, '\0', "config", string_arg, 0)
arg(trustcache_ARG, '\0', "trustcache", NULL, 0)
arg(cache_ARG, '\0', "cache", NULL, 0)
arg(cache_long_ARG, '\0', "cache", NULL, 0)
arg(cachemode_ARG, '\0', "cachemode", string_arg, 0)
arg(cachepool_ARG, '\0', "cachepool", string_arg, 0)
arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL, 0)
@ -140,6 +140,7 @@ arg(file_ARG, 'f', "file", string_arg, 0)
arg(force_ARG, 'f', "force", NULL, ARG_COUNTABLE)
arg(full_ARG, 'f', "full", NULL, 0)
arg(help_ARG, 'h', "help", NULL, 0)
arg(cache_ARG, 'H', "cache", NULL, 0)
arg(help2_ARG, '?', "", NULL, 0)
arg(stripesize_ARG, 'I', "stripesize", size_kb_arg, 0)
arg(stripes_ARG, 'i', "stripes", int_arg, 0)

6
tools/commands.h
View File

@ -592,7 +592,7 @@ xx(lvscan,
"\t[--version]\n",
all_ARG, blockdevice_ARG, ignorelockingfailure_ARG, partial_ARG,
readonly_ARG, cache_ARG)
readonly_ARG, cache_long_ARG)
xx(pvchange,
"Change attributes of physical volume(s)",
@ -839,7 +839,7 @@ xx(pvscan,
"\t[-v|--verbose] " "\n"
"\t[--version]\n",
activate_ARG, available_ARG, backgroundfork_ARG, cache_ARG,
activate_ARG, available_ARG, backgroundfork_ARG, cache_long_ARG,
exported_ARG, ignorelockingfailure_ARG, major_ARG, minor_ARG,
novolumegroup_ARG, partial_ARG, readonly_ARG, short_ARG, uuid_ARG)
@ -1227,7 +1227,7 @@ xx(vgscan,
"\t[-v|--verbose]\n"
"\t[--version]" "\n",
cache_ARG, ignorelockingfailure_ARG, mknodes_ARG, partial_ARG)
cache_long_ARG, ignorelockingfailure_ARG, mknodes_ARG, partial_ARG)
xx(vgsplit,
"Move physical volumes into a new or existing volume group",

4
tools/lvscan.c
View File

@ -56,7 +56,7 @@ static int lvscan_single(struct cmd_context *cmd, struct logical_volume *lv,
const char *active_str, *snapshot_str;
if (arg_count(cmd, cache_ARG))
if (arg_count(cmd, cache_long_ARG))
return _lvscan_single_lvmetad(cmd, lv);
if (!arg_count(cmd, all_ARG) && !lv_is_visible(lv))
@ -93,7 +93,7 @@ static int lvscan_single(struct cmd_context *cmd, struct logical_volume *lv,
int lvscan(struct cmd_context *cmd, int argc, char **argv)
{
if (argc && !arg_count(cmd, cache_ARG)) {
if (argc && !arg_count(cmd, cache_long_ARG)) {
log_error("No additional command line arguments allowed");
return EINVALID_CMD_LINE;
}

2
tools/pvscan.c
View File

@ -327,7 +327,7 @@ int pvscan(struct cmd_context *cmd, int argc, char **argv)
uint64_t size_new = 0;
unsigned len;
if (arg_count(cmd, cache_ARG))
if (arg_count(cmd, cache_long_ARG))
return _pvscan_lvmetad(cmd, argc, argv);
if (argc) {

2
tools/vgscan.c
View File

@ -46,7 +46,7 @@ int vgscan(struct cmd_context *cmd, int argc, char **argv)
cmd->filter->wipe(cmd->filter);
lvmcache_destroy(cmd, 1, 0);
if (arg_count(cmd, cache_ARG)) {
if (arg_count(cmd, cache_long_ARG)) {
if (lvmetad_active()) {
if (!lvmetad_pvscan_all_devs(cmd, NULL))
return ECMD_FAILED;