Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99fc6487 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] add config entry to enable log_debug 



Add a new dlm_config_info field to enable log_debug output and change
log_debug() to use it.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 68c817a1

fs/dlm/config.c

+3 −1
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 
#define DEFAULT_RECOVER_TIMER      5

#define DEFAULT_TOSS_SECS         10

#define DEFAULT_SCAN_SECS          5

#define DEFAULT_LOG_DEBUG          0



struct dlm_config_info dlm_config = {

	.ci_tcp_port = DEFAULT_TCP_PORT,
@@ -784,6 +785,7 @@ struct dlm_config_info dlm_config = { 
	.ci_dirtbl_size = DEFAULT_DIRTBL_SIZE,

	.ci_recover_timer = DEFAULT_RECOVER_TIMER,

	.ci_toss_secs = DEFAULT_TOSS_SECS,

	.ci_scan_secs = DEFAULT_SCAN_SECS

	.ci_scan_secs = DEFAULT_SCAN_SECS,

	.ci_log_debug = DEFAULT_LOG_DEBUG

};

fs/dlm/config.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct dlm_config_info { 
	int ci_recover_timer;

	int ci_toss_secs;

	int ci_scan_secs;

	int ci_log_debug;

};



extern struct dlm_config_info dlm_config;

fs/dlm/dlm_internal.h

+7 −6
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/uaccess.h>



#include <linux/dlm.h>

#include "config.h"



#define DLM_LOCKSPACE_LEN	64
@@ -69,12 +70,12 @@ struct dlm_mhandle; 
#define log_error(ls, fmt, args...) \

	printk(KERN_ERR "dlm: %s: " fmt "\n", (ls)->ls_name , ##args)



#define DLM_LOG_DEBUG

#ifdef DLM_LOG_DEBUG

#define log_debug(ls, fmt, args...) log_error(ls, fmt, ##args)

#else

#define log_debug(ls, fmt, args...)

#endif

#define log_debug(ls, fmt, args...) \

do { \

	if (dlm_config.ci_log_debug) \

		printk(KERN_DEBUG "dlm: %s: " fmt "\n", \

		       (ls)->ls_name , ##args); \

} while (0)



#define DLM_ASSERT(x, do) \

{ \