LVM2 daemons/clvmd/lvm-functions.c tools/lvmcm ...

LVM2 daemons/clvmd/lvm-functions.c tools/lvmcm ...

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2008-12-11 03:34:12

Modified files:
	daemons/clvmd  : lvm-functions.c 
	tools          : lvmcmdline.c 

Log message:
	Remove redundant set_activation() call after create_toolcontext() calls.
	
	Very similar argument to removal of init_debug() and other calls.
	
	create_toolcontext() calls _process_config() which sets
	cmd->default_settings.activation, then calls
	set_activation(cmd->default_settings.activation).  Later, create_toolcontext()
	sets cmd->current_settings = cmd->default_settings.  So these calls
	set_activation(cmd->current_settings.activation) are redundant.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.52&r2=1.53
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.83&r2=1.84

--- LVM2/daemons/clvmd/lvm-functions.c	2008/12/11 03:33:35	1.52
+++ LVM2/daemons/clvmd/lvm-functions.c	2008/12/11 03:34:12	1.53
@@ -732,7 +732,6 @@
 	/* Use LOG_DAEMON for syslog messages instead of LOG_USER */
 	init_syslog(LOG_DAEMON);
 	openlog("clvmd", LOG_PID, LOG_DAEMON);
-	set_activation(cmd->current_settings.activation);
 	cmd->cmd_line = (char *)"clvmd";
 
 	/* Check lvm.conf is setup for cluster-LVM */
--- LVM2/tools/lvmcmdline.c	2008/12/11 03:33:35	1.83
+++ LVM2/tools/lvmcmdline.c	2008/12/11 03:34:12	1.84
@@ -1097,8 +1097,6 @@
 	init_msg_prefix(cmd->default_settings.msg_prefix);
 	init_cmd_name(cmd->default_settings.cmd_name);
 
-	set_activation(cmd->current_settings.activation);
-
 	cmd->fmt = arg_ptr_value(cmd, metadatatype_ARG,
 				 cmd->current_settings.fmt);
 

LVM2 daemons/clvmd/lvm-functions.c tools/lvmcm ...

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2008-12-11 03:30:20

Modified files:
	daemons/clvmd  : lvm-functions.c 
	tools          : lvmcmdline.c 

Log message:
	Remove init_verbose() calls immediately after create_toolcontext() calls.
	
	The rationale for removing init_verbose() call is very similar to removing
	init_debug() call.  create_toolcontext() calls _init_logging() which
	makes these calls:
	/* Verbose level for tty output */
	cmd->default_settings.verbose =
	find_config_tree_int(cmd, "log/verbose", DEFAULT_VERBOSE);
	init_verbose(cmd->default_settings.verbose + VERBOSE_BASE_LEVEL);
	
	And being that create_toolcontext() copies default_settings into
	current_settings at the bottom, the init_verbose() call we are removing:
	init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
	
	is redundant.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.49&r2=1.50
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.78&r2=1.79

--- LVM2/daemons/clvmd/lvm-functions.c	2008/12/11 03:29:37	1.49
+++ LVM2/daemons/clvmd/lvm-functions.c	2008/12/11 03:30:19	1.50
@@ -732,7 +732,6 @@
 	/* Use LOG_DAEMON for syslog messages instead of LOG_USER */
 	init_syslog(LOG_DAEMON);
 	openlog("clvmd", LOG_PID, LOG_DAEMON);
-	init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
 	set_activation(cmd->current_settings.activation);
 	archive_enable(cmd, cmd->current_settings.archive);
 	backup_enable(cmd, cmd->current_settings.backup);
--- LVM2/tools/lvmcmdline.c	2008/12/11 03:29:37	1.78
+++ LVM2/tools/lvmcmdline.c	2008/12/11 03:30:20	1.79
@@ -1091,7 +1091,6 @@
 	if (!(cmd = create_toolcontext(_cmdline.the_args, is_static, 0)))
 		return_NULL;
 
-	init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
 	init_test(cmd->current_settings.test);
 	init_full_scan_done(0);
 	init_mirror_in_sync(0);

LVM2 daemons/clvmd/lvm-functions.c tools/lvmcm ...

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2008-12-11 03:29:37

Modified files:
	daemons/clvmd  : lvm-functions.c 
	tools          : lvmcmdline.c 

Log message:
	Remove init_debug() calls immediately after create_toolcontext() call.
	
	We can safely remove because create_toolcontext() calls _init_logging(),
	which makes these calls:
	/* Debug level for log file output */
	cmd->default_settings.debug =
	find_config_tree_int(cmd, "log/level", DEFAULT_LOGLEVEL);
	init_debug(cmd->default_settings.debug);
	
	Then at the bottom of create_toolcontext() we do this:
	cmd->current_settings = cmd->default_settings;
	
	So the call we are removing from init_lvm() functions (clvmd and lvmcmdline):
	init_debug(cmd->current_settings.debug);
	
	Just sets the value of debug based on 'cmd->current_settings.debug'.
	Since cmd->current_settings is equivalent to cmd->default_settings, and
	init_debug() was called with cmd->default_settings, the call we remove is
	redundant.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.48&r2=1.49
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.77&r2=1.78

--- LVM2/daemons/clvmd/lvm-functions.c	2008/11/04 16:41:47	1.48
+++ LVM2/daemons/clvmd/lvm-functions.c	2008/12/11 03:29:37	1.49
@@ -732,7 +732,6 @@
 	/* Use LOG_DAEMON for syslog messages instead of LOG_USER */
 	init_syslog(LOG_DAEMON);
 	openlog("clvmd", LOG_PID, LOG_DAEMON);
-	init_debug(cmd->current_settings.debug);
 	init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
 	set_activation(cmd->current_settings.activation);
 	archive_enable(cmd, cmd->current_settings.archive);
--- LVM2/tools/lvmcmdline.c	2008/12/11 03:28:54	1.77
+++ LVM2/tools/lvmcmdline.c	2008/12/11 03:29:37	1.78
@@ -1091,7 +1091,6 @@
 	if (!(cmd = create_toolcontext(_cmdline.the_args, is_static, 0)))
 		return_NULL;
 
-	init_debug(cmd->current_settings.debug);
 	init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
 	init_test(cmd->current_settings.test);
 	init_full_scan_done(0);