shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

Remove archive_enable() calls after create_toolcontext() calls.

Browse Source 
_init_backup() calls archive_init(), which originally set 'enabled' to
a hardcoded '1' value.  This seems incorrect based on my read of other
areas of the code so here we add a 'enabled' paramter to archive_init().
We pass in cmd->default_settings.archive, which is obtained from the
config tree.  Later in create_toolcontext, cmd->current_settings is
set to cmd->default_settings.  The archive_enable() call we remove
here was using cmd->current_settings to set the 'archive' enable
value.  The final value of cmd->archive_params->enabled should thus
be equivalent to the original code.
This commit is contained in:
Dave Wysochanski 2008-12-11 03:32:56 +00:00
parent 058f3d3523
commit 4fa2c7f8b6
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemons/clvmd/lvm-functions.c
View File

@ -733,7 +733,6 @@ int init_lvm(int using_gulm)
init_syslog(LOG_DAEMON); init_syslog(LOG_DAEMON);
openlog("clvmd", LOG_PID, LOG_DAEMON); openlog("clvmd", LOG_PID, LOG_DAEMON);
set_activation(cmd->current_settings.activation); set_activation(cmd->current_settings.activation);
archive_enable(cmd, cmd->current_settings.archive);
backup_enable(cmd, cmd->current_settings.backup); backup_enable(cmd, cmd->current_settings.backup);
cmd->cmd_line = (char *)"clvmd"; cmd->cmd_line = (char *)"clvmd";

5
lib/commands/toolcontext.c
View File

@ -926,7 +926,7 @@ static int _init_backup(struct cmd_context *cmd)
if (!cmd->sys_dir) { if (!cmd->sys_dir) {
log_warn("WARNING: Metadata changes will NOT be backed up"); log_warn("WARNING: Metadata changes will NOT be backed up");
backup_init(cmd, ""); backup_init(cmd, "");
archive_init(cmd, "", 0, 0); archive_init(cmd, "", 0, 0, 0);
return 1; return 1;
} }
@ -952,7 +952,8 @@ static int _init_backup(struct cmd_context *cmd)
dir = find_config_tree_str(cmd, "backup/archive_dir", dir = find_config_tree_str(cmd, "backup/archive_dir",
default_dir); default_dir);
if (!archive_init(cmd, dir, days, min)) { if (!archive_init(cmd, dir, days, min,
cmd->default_settings.archive)) {
log_debug("backup_init failed."); log_debug("backup_init failed.");
return 0; return 0;
} }

5
lib/format_text/archiver.c
View File

@ -36,7 +36,8 @@ struct backup_params {
}; };
int archive_init(struct cmd_context *cmd, const char *dir, int archive_init(struct cmd_context *cmd, const char *dir,
unsigned int keep_days, unsigned int keep_min) unsigned int keep_days, unsigned int keep_min,
int enabled)
{ {
if (!(cmd->archive_params = dm_pool_zalloc(cmd->libmem, if (!(cmd->archive_params = dm_pool_zalloc(cmd->libmem,
sizeof(*cmd->archive_params)))) { sizeof(*cmd->archive_params)))) {
@ -56,7 +57,7 @@ int archive_init(struct cmd_context *cmd, const char *dir,
cmd->archive_params->keep_days = keep_days; cmd->archive_params->keep_days = keep_days;
cmd->archive_params->keep_number = keep_min; cmd->archive_params->keep_number = keep_min;
cmd->archive_params->enabled = 1; archive_enable(cmd, enabled);
return 1; return 1;
} }

3
lib/format_text/archiver.h
View File

@ -32,7 +32,8 @@
*/ */
int archive_init(struct cmd_context *cmd, const char *dir, int archive_init(struct cmd_context *cmd, const char *dir,
unsigned int keep_days, unsigned int keep_min); unsigned int keep_days, unsigned int keep_min,
int enabled);
void archive_exit(struct cmd_context *cmd); void archive_exit(struct cmd_context *cmd);
void archive_enable(struct cmd_context *cmd, int flag); void archive_enable(struct cmd_context *cmd, int flag);

1
tools/lvmcmdline.c
View File

@ -1097,7 +1097,6 @@ struct cmd_context *init_lvm(unsigned is_static)
init_msg_prefix(cmd->default_settings.msg_prefix); init_msg_prefix(cmd->default_settings.msg_prefix);
init_cmd_name(cmd->default_settings.cmd_name); init_cmd_name(cmd->default_settings.cmd_name);
archive_enable(cmd, cmd->current_settings.archive);
backup_enable(cmd, cmd->current_settings.backup); backup_enable(cmd, cmd->current_settings.backup);
set_activation(cmd->current_settings.activation); set_activation(cmd->current_settings.activation);