shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dmstats: rename --auxdata to --userdata

Browse Source
This commit is contained in:
Bryn M. Reeves 2016-07-05 15:54:02 +01:00
parent 14b74c360f
commit cf0fa3d693
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/dmstats.8.in
View File

@ -87,8 +87,8 @@ dmstats \(em device-mapper statistics management
. IR start_sector . IR start_sector
. BR \-\-length . BR \-\-length
. IR length | \fB\-\-segments ] . IR length | \fB\-\-segments ]
. RB \%[ \-\-auxdata . RB \%[ \-\-userdata
. IR data ] . IR user_data ]
. RB [ \-\-programid . RB [ \-\-programid
. IR id ] . IR id ]
. ad b . ad b
@ -268,8 +268,8 @@ optional suffix selects units of:
.HELP_UNITS .HELP_UNITS
. .
.HP .HP
.BR \-\-auxdata .BR \-\-userdata
.IR aux_data .IR user_data
.br .br
Specify user data (a word) to be stored with a new region. The value Specify user data (a word) to be stored with a new region. The value
is added to any internal auxilliary data (for example, group is added to any internal auxilliary data (for example, group

20
tools/dmsetup.c
View File

@ -163,7 +163,6 @@ enum {
AREA_ARG, AREA_ARG,
AREAS_ARG, AREAS_ARG,
AREA_SIZE_ARG, AREA_SIZE_ARG,
AUX_DATA_ARG,
BOUNDS_ARG, BOUNDS_ARG,
CHECKS_ARG, CHECKS_ARG,
CLEAR_ARG, CLEAR_ARG,
@ -220,6 +219,7 @@ enum {
UNBUFFERED_ARG, UNBUFFERED_ARG,
UNITS_ARG, UNITS_ARG,
UNQUOTED_ARG, UNQUOTED_ARG,
USER_DATA_ARG,
UUID_ARG, UUID_ARG,
VERBOSE_ARG, VERBOSE_ARG,
VERIFYUDEV_ARG, VERIFYUDEV_ARG,
@ -4925,8 +4925,8 @@ static int _stats_create(CMD_ARGS)
if (!strlen(program_id) && !_switches[FORCE_ARG]) if (!strlen(program_id) && !_switches[FORCE_ARG])
program_id = DM_STATS_PROGRAM_ID; program_id = DM_STATS_PROGRAM_ID;
if (_switches[AUX_DATA_ARG]) if (_switches[USER_DATA_ARG])
user_data = _string_args[AUX_DATA_ARG]; user_data = _string_args[USER_DATA_ARG];
if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID))) if (!(dms = dm_stats_create(DM_STATS_PROGRAM_ID)))
return_0; return_0;
@ -5327,7 +5327,7 @@ static int _stats_help(CMD_ARGS);
* clear [--regionid id] <device_name> * clear [--regionid id] <device_name>
* create [--areas nr_areas] [--areasize size] * create [--areas nr_areas] [--areasize size]
* [ [--start start] [--length len] | [--segments]] * [ [--start start] [--length len] | [--segments]]
* [--auxdata data] [--programid id] [<device_name>] * [--userdata data] [--programid id] [<device_name>]
* delete [--regionid] <device_name> * delete [--regionid] <device_name>
* delete_all [--programid id] * delete_all [--programid id]
* group [--alias name] [--alldevices] [--regions <regions>] [<device_name>] * group [--alias name] [--alldevices] [--regions <regions>] [<device_name>]
@ -5340,7 +5340,7 @@ static int _stats_help(CMD_ARGS);
#define AREA_OPTS "[--areas <nr_areas>] [--areasize <size>] " #define AREA_OPTS "[--areas <nr_areas>] [--areasize <size>] "
#define CREATE_OPTS "[--start <start> [--length <len>]]\n\t\t" AREA_OPTS #define CREATE_OPTS "[--start <start> [--length <len>]]\n\t\t" AREA_OPTS
#define ID_OPTS "[--programid <id>] [--auxdata <data> ] " #define ID_OPTS "[--programid <id>] [--userdata <data> ] "
#define SELECT_OPTS "[--programid <id>] [--regionid <id>] " #define SELECT_OPTS "[--programid <id>] [--regionid <id>] "
#define PRINT_OPTS "[--clear] " SELECT_OPTS #define PRINT_OPTS "[--clear] " SELECT_OPTS
#define REPORT_OPTS "[--interval <seconds>] [--count <cnt>]\n\t\t[--units <u>]" SELECT_OPTS #define REPORT_OPTS "[--interval <seconds>] [--count <cnt>]\n\t\t[--units <u>]" SELECT_OPTS
@ -5429,7 +5429,7 @@ static void _stats_usage(FILE *out)
fprintf(out, " [-h|--help]\n"); fprintf(out, " [-h|--help]\n");
fprintf(out, " [-v|--verbose [-v|--verbose ...]]\n"); fprintf(out, " [-v|--verbose [-v|--verbose ...]]\n");
fprintf(out, " [--areas <nr_areas>] [--areasize <size>]\n"); fprintf(out, " [--areas <nr_areas>] [--areasize <size>]\n");
fprintf(out, " [--auxdata <data>] [--clear]\n"); fprintf(out, " [--userdata <data>] [--clear]\n");
fprintf(out, " [--count <count>] [--interval <seconds>]\n"); fprintf(out, " [--count <count>] [--interval <seconds>]\n");
fprintf(out, " [-o <fields>] [-O|--sort <sort_fields>]\n"); fprintf(out, " [-o <fields>] [-O|--sort <sort_fields>]\n");
fprintf(out, " [--programid <id>]\n"); fprintf(out, " [--programid <id>]\n");
@ -5973,7 +5973,6 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir)
{"area", 0, &ind, AREA_ARG}, {"area", 0, &ind, AREA_ARG},
{"areas", 1, &ind, AREAS_ARG}, {"areas", 1, &ind, AREAS_ARG},
{"areasize", 1, &ind, AREA_SIZE_ARG}, {"areasize", 1, &ind, AREA_SIZE_ARG},
{"auxdata", 1, &ind, AUX_DATA_ARG},
{"bounds", 1, &ind, BOUNDS_ARG}, {"bounds", 1, &ind, BOUNDS_ARG},
{"checks", 0, &ind, CHECKS_ARG}, {"checks", 0, &ind, CHECKS_ARG},
{"clear", 0, &ind, CLEAR_ARG}, {"clear", 0, &ind, CLEAR_ARG},
@ -6031,6 +6030,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir)
{"uuid", 1, &ind, UUID_ARG}, {"uuid", 1, &ind, UUID_ARG},
{"unbuffered", 0, &ind, UNBUFFERED_ARG}, {"unbuffered", 0, &ind, UNBUFFERED_ARG},
{"unquoted", 0, &ind, UNQUOTED_ARG}, {"unquoted", 0, &ind, UNQUOTED_ARG},
{"userdata", 1, &ind, USER_DATA_ARG},
{"verbose", 1, &ind, VERBOSE_ARG}, {"verbose", 1, &ind, VERBOSE_ARG},
{"verifyudev", 0, &ind, VERIFYUDEV_ARG}, {"verifyudev", 0, &ind, VERIFYUDEV_ARG},
{"version", 0, &ind, VERSION_ARG}, {"version", 0, &ind, VERSION_ARG},
@ -6128,9 +6128,9 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir)
_switches[AREA_SIZE_ARG]++; _switches[AREA_SIZE_ARG]++;
_string_args[AREA_SIZE_ARG] = optarg; _string_args[AREA_SIZE_ARG] = optarg;
} }
if (ind == AUX_DATA_ARG) { if (ind == USER_DATA_ARG) {
_switches[AUX_DATA_ARG]++; _switches[USER_DATA_ARG]++;
_string_args[AUX_DATA_ARG] = optarg; _string_args[USER_DATA_ARG] = optarg;
} }
if (c == ':' || c == '?') if (c == ':' || c == '?')
return_0; return_0;