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

Commit 68c817a1 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] rename dlm_config_info fields 



Add a "ci_" prefix to the fields in the dlm_config_info struct so that we
can use macros to add configfs functions to access them (in a later
patch).  No functional changes in this patch, just naming changes.

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

fs/dlm/config.c

+8 −8
Original line number Diff line number Diff line
@@ -777,13 +777,13 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 
#define DEFAULT_SCAN_SECS          5



struct dlm_config_info dlm_config = {

	.tcp_port = DEFAULT_TCP_PORT,

	.buffer_size = DEFAULT_BUFFER_SIZE,

	.rsbtbl_size = DEFAULT_RSBTBL_SIZE,

	.lkbtbl_size = DEFAULT_LKBTBL_SIZE,

	.dirtbl_size = DEFAULT_DIRTBL_SIZE,

	.recover_timer = DEFAULT_RECOVER_TIMER,

	.toss_secs = DEFAULT_TOSS_SECS,

	.scan_secs = DEFAULT_SCAN_SECS

	.ci_tcp_port = DEFAULT_TCP_PORT,

	.ci_buffer_size = DEFAULT_BUFFER_SIZE,

	.ci_rsbtbl_size = DEFAULT_RSBTBL_SIZE,

	.ci_lkbtbl_size = DEFAULT_LKBTBL_SIZE,

	.ci_dirtbl_size = DEFAULT_DIRTBL_SIZE,

	.ci_recover_timer = DEFAULT_RECOVER_TIMER,

	.ci_toss_secs = DEFAULT_TOSS_SECS,

	.ci_scan_secs = DEFAULT_SCAN_SECS

};

fs/dlm/config.h

+8 −8
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
#define DLM_MAX_ADDR_COUNT 3



struct dlm_config_info {

	int tcp_port;

	int buffer_size;

	int rsbtbl_size;

	int lkbtbl_size;

	int dirtbl_size;

	int recover_timer;

	int toss_secs;

	int scan_secs;

	int ci_tcp_port;

	int ci_buffer_size;

	int ci_rsbtbl_size;

	int ci_lkbtbl_size;

	int ci_dirtbl_size;

	int ci_recover_timer;

	int ci_toss_secs;

	int ci_scan_secs;

};



extern struct dlm_config_info dlm_config;

fs/dlm/lock.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static int shrink_bucket(struct dlm_ls *ls, int b) 
		list_for_each_entry_reverse(r, &ls->ls_rsbtbl[b].toss,

					    res_hashchain) {

			if (!time_after_eq(jiffies, r->res_toss_time +

					   dlm_config.toss_secs * HZ))

					   dlm_config.ci_toss_secs * HZ))

				continue;

			found = 1;

			break;

fs/dlm/lockspace.c

+5 −5
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int dlm_scand(void *data) 
	while (!kthread_should_stop()) {

		list_for_each_entry(ls, &lslist, ls_list)

			dlm_scan_rsbs(ls);

		schedule_timeout_interruptible(dlm_config.scan_secs * HZ);

		schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);

	}

	return 0;

}
@@ -422,7 +422,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace, 
	ls->ls_count = 0;

	ls->ls_flags = 0;



	size = dlm_config.rsbtbl_size;

	size = dlm_config.ci_rsbtbl_size;

	ls->ls_rsbtbl_size = size;



	ls->ls_rsbtbl = kmalloc(sizeof(struct dlm_rsbtable) * size, GFP_KERNEL);
@@ -434,7 +434,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace, 
		rwlock_init(&ls->ls_rsbtbl[i].lock);

	}



	size = dlm_config.lkbtbl_size;

	size = dlm_config.ci_lkbtbl_size;

	ls->ls_lkbtbl_size = size;



	ls->ls_lkbtbl = kmalloc(sizeof(struct dlm_lkbtable) * size, GFP_KERNEL);
@@ -446,7 +446,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace, 
		ls->ls_lkbtbl[i].counter = 1;

	}



	size = dlm_config.dirtbl_size;

	size = dlm_config.ci_dirtbl_size;

	ls->ls_dirtbl_size = size;



	ls->ls_dirtbl = kmalloc(sizeof(struct dlm_dirtable) * size, GFP_KERNEL);
@@ -489,7 +489,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace, 
	mutex_init(&ls->ls_requestqueue_mutex);

	mutex_init(&ls->ls_clear_proc_locks);



	ls->ls_recover_buf = kmalloc(dlm_config.buffer_size, GFP_KERNEL);

	ls->ls_recover_buf = kmalloc(dlm_config.ci_buffer_size, GFP_KERNEL);

	if (!ls->ls_recover_buf)

		goto out_dirfree;

fs/dlm/lowcomms-sctp.c

+3 −3
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static int add_bind_addr(struct sockaddr_storage *addr, int addr_len, int num) 


	if (result < 0)

		log_print("Can't bind to port %d addr number %d",

			  dlm_config.tcp_port, num);

			  dlm_config.ci_tcp_port, num);



	return result;

}
@@ -711,7 +711,7 @@ static int init_sock(void) 
	/* Bind to all interfaces. */

	for (i = 0; i < dlm_local_count; i++) {

		memcpy(&localaddr, dlm_local_addr[i], sizeof(localaddr));

		make_sockaddr(&localaddr, dlm_config.tcp_port, &addr_len);

		make_sockaddr(&localaddr, dlm_config.ci_tcp_port, &addr_len);



		result = add_bind_addr(&localaddr, addr_len, num);

		if (result)
@@ -863,7 +863,7 @@ static void initiate_association(int nodeid) 
		return;

	}



	make_sockaddr(&rem_addr, dlm_config.tcp_port, &addrlen);

	make_sockaddr(&rem_addr, dlm_config.ci_tcp_port, &addrlen);



	outmessage.msg_name = &rem_addr;

	outmessage.msg_namelen = addrlen;