shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

- change new log_ARG variable to more explicit mirrorlog_ARG.

Browse Source
This commit is contained in:
Jonathan Earl Brassow 2007-08-09 21:25:08 +00:00
parent 654a391250
commit 295019815e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/args.h
View File

@ -48,7 +48,7 @@ arg(mirrorsonly_ARG, '\0', "mirrorsonly", NULL)
arg(nosync_ARG, '\0', "nosync", NULL)
arg(resync_ARG, '\0', "resync", NULL)
arg(corelog_ARG, '\0', "corelog", NULL)
arg(log_ARG, '\0', "log", string_arg)
arg(mirrorlog_ARG, '\0', "log", string_arg)
arg(monitor_ARG, '\0', "monitor", yes_no_arg)
arg(config_ARG, '\0', "config", string_arg)
arg(trustcache_ARG, '\0', "trustcache", NULL)

4
tools/commands.h
View File

@ -107,7 +107,7 @@ xx(lvconvert,
"\t[--version]" "\n"
"\tOriginalLogicalVolume[Path] SnapshotLogicalVolume[Path]\n",
alloc_ARG, chunksize_ARG, mirrors_ARG, corelog_ARG, log_ARG,
alloc_ARG, chunksize_ARG, mirrors_ARG, corelog_ARG, mirrorlog_ARG,
regionsize_ARG, snapshot_ARG, test_ARG, zero_ARG)
xx(lvcreate,
@ -156,7 +156,7 @@ xx(lvcreate,
"\tOriginalLogicalVolume[Path] [PhysicalVolumePath...]\n\n",
addtag_ARG, alloc_ARG, autobackup_ARG, chunksize_ARG, contiguous_ARG,
corelog_ARG, log_ARG, extents_ARG, major_ARG, minor_ARG, mirrors_ARG, name_ARG,
corelog_ARG, mirrorlog_ARG, extents_ARG, major_ARG, minor_ARG, mirrors_ARG, name_ARG,
nosync_ARG, permission_ARG, persistent_ARG, readahead_ARG, regionsize_ARG,
size_ARG, snapshot_ARG, stripes_ARG, stripesize_ARG, test_ARG, type_ARG,
zero_ARG)

10
tools/lvconvert.c
View File

@ -107,7 +107,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd,
memset(lp, 0, sizeof(*lp));
if (arg_count(cmd, log_ARG) > 1) {
if (arg_count(cmd, mirrorlog_ARG) > 1) {
log_error("Too many --log arguments supplied.");
return 0;
}
@ -119,7 +119,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd,
log_error("Too many --snapshot arguments supplied.");
return 0;
}
if (arg_count(cmd, log_ARG) || arg_count(cmd, mirrors_ARG))
if (arg_count(cmd, mirrorlog_ARG) || arg_count(cmd, mirrors_ARG))
count = 1;
count += arg_count(cmd, snapshot_ARG);
@ -294,8 +294,8 @@ static int lvconvert_mirrors(struct cmd_context * cmd, struct logical_volume * l
corelog = 1;
}
if (arg_count(cmd, log_ARG)) {
log_arg = arg_str_value(cmd, log_ARG, "disk");
if (arg_count(cmd, mirrorlog_ARG)) {
log_arg = arg_str_value(cmd, mirrorlog_ARG, "disk");
if (!strcmp("disk", log_arg)) {
log_verbose("Setting logging type to \"disk\"");
corelog = 0;
@ -588,7 +588,7 @@ static int lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv,
}
if (arg_count(cmd, mirrors_ARG) ||
((lv->status & MIRRORED) && arg_count(cmd, log_ARG))) {
((lv->status & MIRRORED) && arg_count(cmd, mirrorlog_ARG))) {
if (!archive(lv->vg))
return ECMD_FAILED;
if (!lvconvert_mirrors(cmd, lv, lp))

4
tools/lvcreate.c
View File

@ -290,8 +290,8 @@ static int _read_mirror_params(struct lvcreate_params *lp,
lp->corelog = 1;
}
if (arg_count(cmd, log_ARG)) {
log_arg = arg_str_value(cmd, log_ARG, "disk");
if (arg_count(cmd, mirrorlog_ARG)) {
log_arg = arg_str_value(cmd, mirrorlog_ARG, "disk");
if (!strcmp("disk", log_arg)) {
log_verbose("Setting logging type to \"disk\"");
lp->corelog = 0;