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

Commit ba4f6789 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm 

Pull dlm updates from David Teigland:
 "This set includes two trivial changes, one to use kmemdup and another
  to control the log level of recovery messages"

* tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: Use kmemdup instead of kmalloc and memcpy
  dlm: add log_info config option
parents 4fc29c1a 5c93f56f

fs/dlm/config.c

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ struct dlm_cluster { 
	unsigned int cl_toss_secs;

	unsigned int cl_scan_secs;

	unsigned int cl_log_debug;

	unsigned int cl_log_info;

	unsigned int cl_protocol;

	unsigned int cl_timewarn_cs;

	unsigned int cl_waitwarn_us;
@@ -95,6 +96,7 @@ enum { 
	CLUSTER_ATTR_TOSS_SECS,

	CLUSTER_ATTR_SCAN_SECS,

	CLUSTER_ATTR_LOG_DEBUG,

	CLUSTER_ATTR_LOG_INFO,

	CLUSTER_ATTR_PROTOCOL,

	CLUSTER_ATTR_TIMEWARN_CS,

	CLUSTER_ATTR_WAITWARN_US,
@@ -166,6 +168,7 @@ CLUSTER_ATTR(recover_timer, 1); 
CLUSTER_ATTR(toss_secs, 1);

CLUSTER_ATTR(scan_secs, 1);

CLUSTER_ATTR(log_debug, 0);

CLUSTER_ATTR(log_info, 0);

CLUSTER_ATTR(protocol, 0);

CLUSTER_ATTR(timewarn_cs, 1);

CLUSTER_ATTR(waitwarn_us, 0);
@@ -180,6 +183,7 @@ static struct configfs_attribute *cluster_attrs[] = { 
	[CLUSTER_ATTR_TOSS_SECS] = &cluster_attr_toss_secs,

	[CLUSTER_ATTR_SCAN_SECS] = &cluster_attr_scan_secs,

	[CLUSTER_ATTR_LOG_DEBUG] = &cluster_attr_log_debug,

	[CLUSTER_ATTR_LOG_INFO] = &cluster_attr_log_info,

	[CLUSTER_ATTR_PROTOCOL] = &cluster_attr_protocol,

	[CLUSTER_ATTR_TIMEWARN_CS] = &cluster_attr_timewarn_cs,

	[CLUSTER_ATTR_WAITWARN_US] = &cluster_attr_waitwarn_us,
@@ -365,6 +369,7 @@ static struct config_group *make_cluster(struct config_group *g, 
	cl->cl_toss_secs = dlm_config.ci_toss_secs;

	cl->cl_scan_secs = dlm_config.ci_scan_secs;

	cl->cl_log_debug = dlm_config.ci_log_debug;

	cl->cl_log_info = dlm_config.ci_log_info;

	cl->cl_protocol = dlm_config.ci_protocol;

	cl->cl_timewarn_cs = dlm_config.ci_timewarn_cs;

	cl->cl_waitwarn_us = dlm_config.ci_waitwarn_us;
@@ -850,6 +855,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 
#define DEFAULT_TOSS_SECS         10

#define DEFAULT_SCAN_SECS          5

#define DEFAULT_LOG_DEBUG          0

#define DEFAULT_LOG_INFO           1

#define DEFAULT_PROTOCOL           0

#define DEFAULT_TIMEWARN_CS      500 /* 5 sec = 500 centiseconds */

#define DEFAULT_WAITWARN_US	   0
@@ -865,6 +871,7 @@ struct dlm_config_info dlm_config = { 
	.ci_toss_secs = DEFAULT_TOSS_SECS,

	.ci_scan_secs = DEFAULT_SCAN_SECS,

	.ci_log_debug = DEFAULT_LOG_DEBUG,

	.ci_log_info = DEFAULT_LOG_INFO,

	.ci_protocol = DEFAULT_PROTOCOL,

	.ci_timewarn_cs = DEFAULT_TIMEWARN_CS,

	.ci_waitwarn_us = DEFAULT_WAITWARN_US,

fs/dlm/config.h

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

	int ci_scan_secs;

	int ci_log_debug;

	int ci_log_info;

	int ci_protocol;

	int ci_timewarn_cs;

	int ci_waitwarn_us;

fs/dlm/dlm_internal.h

+9 −1
Original line number Diff line number Diff line
@@ -65,8 +65,16 @@ struct dlm_mhandle; 
	printk(KERN_ERR "dlm: "fmt"\n" , ##args)

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

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



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

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

do { \

	if (dlm_config.ci_log_info) \

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

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

	else if (dlm_config.ci_log_debug) \

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

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

} while (0)



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

do { \

fs/dlm/lowcomms.c

+1 −2
Original line number Diff line number Diff line
@@ -1279,10 +1279,9 @@ static void init_local(void) 
		if (dlm_our_addr(&sas, i))

			break;



		addr = kmalloc(sizeof(*addr), GFP_NOFS);

		addr = kmemdup(&sas, sizeof(*addr), GFP_NOFS);

		if (!addr)

			break;

		memcpy(addr, &sas, sizeof(*addr));

		dlm_local_addr[dlm_local_count++] = addr;

	}

}