From 1905eacf15877bdc4c5cfebf3ed354cf8e0d5300 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Fri, 19 Sep 2008 07:12:45 +0000 Subject: [PATCH] rename var --- lib/activate/activate.c | 2 +- lib/commands/toolcontext.h | 2 +- tools/lvmcmdline.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 06954d16e..06ef2b7d9 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1027,7 +1027,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, return 0; } - if ((!lv->vg->cmd->partial_activate) && (lv->status & PARTIAL_LV)) { + if ((!lv->vg->cmd->partial_activation) && (lv->status & PARTIAL_LV)) { log_error("Refusing activation of partial LV %s. Use --partial to override.", lv->name); return_0; diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 8f6cfc7a8..001aef35c 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -69,7 +69,7 @@ struct cmd_context { unsigned is_static:1; /* Static binary? */ unsigned is_long_lived:1; /* Optimises persistent_filter handling */ unsigned handles_missing_pvs:1; - unsigned partial_activate:1; + unsigned partial_activation:1; struct dev_filter *filter; int dump_filter; /* Dump filter when exiting? */ diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index c50641663..98ff7e703 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -710,10 +710,10 @@ static int _get_settings(struct cmd_context *cmd) cmd->current_settings.archive = arg_int_value(cmd, autobackup_ARG, cmd->current_settings.archive); cmd->current_settings.backup = arg_int_value(cmd, autobackup_ARG, cmd->current_settings.backup); cmd->current_settings.cache_vgmetadata = cmd->command->flags & CACHE_VGMETADATA ? 1 : 0; - cmd->partial_activate = 0; + cmd->partial_activation = 0; if (arg_count(cmd, partial_ARG)) { - cmd->partial_activate = 1; + cmd->partial_activation = 1; log_print("Partial mode. Incomplete volume groups will " "be activated read-only."); }