summaryrefslogtreecommitdiffstats
path: root/tools/lvcreate.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2010-01-12 14:00:51 +0000
committerAlasdair Kergon <agk@redhat.com>2010-01-12 14:00:51 +0000
commitf3ac7d1b828871c19a60e9fab7cc3952c1eca891 (patch)
tree5abc5a0dd6bfe308d5519c7bad03e5a527962455 /tools/lvcreate.c
parent3f5cc86aa4258a763dc26a0347239e79ca24b346 (diff)
downloadlvm2-f3ac7d1b828871c19a60e9fab7cc3952c1eca891.tar.gz
lvm2-f3ac7d1b828871c19a60e9fab7cc3952c1eca891.tar.xz
lvm2-f3ac7d1b828871c19a60e9fab7cc3952c1eca891.zip
Revert so-called "redundant" log until after next release.
Diffstat (limited to 'tools/lvcreate.c')
-rw-r--r--tools/lvcreate.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index fa524303..0cfd1403 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -322,29 +322,19 @@ static int _read_mirror_params(struct lvcreate_params *lp,
{
int region_size;
const char *mirrorlog;
-
- /*
- * This param used to be 'corelog' and was initialized to '0'.
- * We initially set to '1' here so as not to screw the logic.
- */
- lp->log_count = 1;
- if (arg_count(cmd, corelog_ARG))
- lp->log_count = 0;
+ int corelog = arg_count(cmd, corelog_ARG);
mirrorlog = arg_str_value(cmd, mirrorlog_ARG,
- !lp->log_count ? "core" : DEFAULT_MIRRORLOG);
+ corelog ? "core" : DEFAULT_MIRRORLOG);
- if (strcmp("core", mirrorlog) && !lp->log_count) {
- log_error("--mirrorlog disk and --corelog "
- "are incompatible");
- return 0;
- }
-
- if (!strcmp("redundant", mirrorlog))
- lp->log_count = 2;
- else if (!strcmp("disk", mirrorlog))
+ if (!strcmp("disk", mirrorlog)) {
+ if (corelog) {
+ log_error("--mirrorlog disk and --corelog "
+ "are incompatible");
+ return 0;
+ }
lp->log_count = 1;
- else if (!strcmp("core", mirrorlog))
+ } else if (!strcmp("core", mirrorlog))
lp->log_count = 0;
else {
log_error("Unknown mirrorlog type: %s", mirrorlog);