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

dmstats: add group alias support

Browse Source
This commit is contained in:
Bryn M. Reeves 2016-03-07 18:16:22 +00:00
parent 0761863e28
commit b55daa28e8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/dmsetup.c
View File

@ -156,6 +156,7 @@ enum {
READ_ONLY = 0, READ_ONLY = 0,
ADD_NODE_ON_CREATE_ARG, ADD_NODE_ON_CREATE_ARG,
ADD_NODE_ON_RESUME_ARG, ADD_NODE_ON_RESUME_ARG,
ALIAS_ARG,
ALL_DEVICES_ARG, ALL_DEVICES_ARG,
ALL_PROGRAMS_ARG, ALL_PROGRAMS_ARG,
ALL_REGIONS_ARG, ALL_REGIONS_ARG,
@ -5092,7 +5093,7 @@ out:
static int _stats_group(CMD_ARGS) static int _stats_group(CMD_ARGS)
{ {
char *name, *regions = NULL; char *name, *alias = NULL, *regions = NULL;
struct dm_stats *dms; struct dm_stats *dms;
uint64_t group_id; uint64_t group_id;
int r = 0; int r = 0;
@ -5124,6 +5125,9 @@ static int _stats_group(CMD_ARGS)
name = argv[0]; name = argv[0];
} }
if (_switches[ALIAS_ARG])
alias = _string_args[ALIAS_ARG];
if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID)))
return_0; return_0;
@ -5133,7 +5137,7 @@ static int _stats_group(CMD_ARGS)
if (!dm_stats_list(dms, NULL)) if (!dm_stats_list(dms, NULL))
goto_out; goto_out;
if(!dm_stats_create_group(dms, regions, NULL, &group_id)) { if(!dm_stats_create_group(dms, regions, alias, &group_id)) {
log_error("Could not create group on %s: %s", name, regions); log_error("Could not create group on %s: %s", name, regions);
goto out; goto out;
} }
@ -5841,6 +5845,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir)
#ifdef HAVE_GETOPTLONG #ifdef HAVE_GETOPTLONG
static struct option long_options[] = { static struct option long_options[] = {
{"readonly", 0, &ind, READ_ONLY}, {"readonly", 0, &ind, READ_ONLY},
{"alias", 1, &ind, ALIAS_ARG},
{"alldevices", 0, &ind, ALL_DEVICES_ARG}, {"alldevices", 0, &ind, ALL_DEVICES_ARG},
{"allprograms", 0, &ind, ALL_PROGRAMS_ARG}, {"allprograms", 0, &ind, ALL_PROGRAMS_ARG},
{"allregions", 0, &ind, ALL_REGIONS_ARG}, {"allregions", 0, &ind, ALL_REGIONS_ARG},
@ -5979,6 +5984,10 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir)
optind = OPTIND_INIT; optind = OPTIND_INIT;
while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy", while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy",
long_options, NULL)) != -1) { long_options, NULL)) != -1) {
if (ind == ALIAS_ARG) {
_switches[ALIAS_ARG]++;
_string_args[ALIAS_ARG] = optarg;
}
if (ind == ALL_DEVICES_ARG) if (ind == ALL_DEVICES_ARG)
_switches[ALL_DEVICES_ARG]++; _switches[ALL_DEVICES_ARG]++;
if (ind == ALL_PROGRAMS_ARG) if (ind == ALL_PROGRAMS_ARG)