[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: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 88553054bbfa4cd7a03efdf41036e75b54255d7a..958021f9148664335bd527b9d656dbba8a070f0e 100644 (file)
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -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
 };
 

diff --git a/fs/dlm/config.h b/fs/dlm/config.h
index 9da7839958a99c87a033efc9c6069041d6aa525b..ce603e1c3bacd18d9153dda313f89aa4ad64f781 100644 (file)
--- a/fs/dlm/config.h
+++ b/fs/dlm/config.h
@@ -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;

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index ed52485a86d0d58c34db2f9eda3241c1fa4a58cd..5bac9827ded30460eb3f4be9936147c7a09800e9 100644 (file)
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -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;

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 59012b089e8d68ba77444a8ef0fd82f8743f5ca6..f40817b53c6fc33fd39e112a7b3d2a07e7089c16 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -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;
 

diff --git a/fs/dlm/lowcomms-sctp.c b/fs/dlm/lowcomms-sctp.c
index 0940a805b3d730fa9f768f0d8039b7e4ed92b430..5aeadadd8afd406d26701b29bb43d1af4c1670c3 100644 (file)
--- a/fs/dlm/lowcomms-sctp.c
+++ b/fs/dlm/lowcomms-sctp.c
@@ -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;

diff --git a/fs/dlm/lowcomms-tcp.c b/fs/dlm/lowcomms-tcp.c
index ce5e7cdfb45d48e64b66aaf8785f05729cbbd6b6..b4fb5783ef8acf8d69b6a3915a2bd2e9149fc477 100644 (file)
--- a/fs/dlm/lowcomms-tcp.c
+++ b/fs/dlm/lowcomms-tcp.c
@@ -548,7 +548,7 @@ static void connect_to_sock(struct connection *con)
        sock->sk->sk_user_data = con;
        con->rx_action = receive_from_sock;
 
-       make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
+       make_sockaddr(&saddr, dlm_config.ci_tcp_port, &addr_len);
 
        add_sock(sock, con);
 
@@ -616,10 +616,10 @@ static struct socket *create_listen_sock(struct connection *con,
        con->sock = sock;
 
        /* Bind to our port */
-       make_sockaddr(saddr, dlm_config.tcp_port, &addr_len);
+       make_sockaddr(saddr, dlm_config.ci_tcp_port, &addr_len);
        result = sock->ops->bind(sock, (struct sockaddr *) saddr, addr_len);
        if (result < 0) {
-               printk("dlm: Can't bind to port %d\n", dlm_config.tcp_port);
+               printk("dlm: Can't bind to port %d\n", dlm_config.ci_tcp_port);
                sock_release(sock);
                sock = NULL;
                con->sock = NULL;
@@ -638,7 +638,8 @@ static struct socket *create_listen_sock(struct connection *con,
 
        result = sock->ops->listen(sock, 5);
        if (result < 0) {
-               printk("dlm: Can't listen on port %d\n", dlm_config.tcp_port);
+               printk("dlm: Can't listen on port %d\n",
+                      dlm_config.ci_tcp_port);
                sock_release(sock);
                sock = NULL;
                goto create_out;

diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c
index c9b1c3d535f4c0e3a1904db462c0b5827090700f..a5126e0c68a69e6983e7d77833586bd928e7a3a7 100644 (file)
--- a/fs/dlm/midcomms.c
+++ b/fs/dlm/midcomms.c
@@ -82,7 +82,7 @@ int dlm_process_incoming_buffer(int nodeid, const void *base,
                if (msglen < sizeof(struct dlm_header))
                        break;
                err = -E2BIG;
-               if (msglen > dlm_config.buffer_size) {
+               if (msglen > dlm_config.ci_buffer_size) {
                        log_print("message size %d from %d too big, buf len %d",
                                  msglen, nodeid, len);
                        break;
@@ -103,7 +103,7 @@ int dlm_process_incoming_buffer(int nodeid, const void *base,
 
                if (msglen > sizeof(__tmp) &&
                    msg == (struct dlm_header *) __tmp) {
-                       msg = kmalloc(dlm_config.buffer_size, GFP_KERNEL);
+                       msg = kmalloc(dlm_config.ci_buffer_size, GFP_KERNEL);
                        if (msg == NULL)
                                return ret;
                }

diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index 2e246af4a62c26dcf814744d385db837a214f86f..6bfbd61538094f72cb1001bc782cc246faf55552 100644 (file)
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -138,7 +138,7 @@ int dlm_rcom_status(struct dlm_ls *ls, int nodeid)
                goto out;
 
        allow_sync_reply(ls, &rc->rc_id);
-       memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
+       memset(ls->ls_recover_buf, 0, dlm_config.ci_buffer_size);
 
        send_rcom(ls, mh, rc);
 
@@ -213,7 +213,7 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
        if (nodeid == dlm_our_nodeid()) {
                dlm_copy_master_names(ls, last_name, last_len,
                                      ls->ls_recover_buf + len,
-                                     dlm_config.buffer_size - len, nodeid);
+                                     dlm_config.ci_buffer_size - len, nodeid);
                goto out;
        }
 
@@ -223,7 +223,7 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
        memcpy(rc->rc_buf, last_name, last_len);
 
        allow_sync_reply(ls, &rc->rc_id);
-       memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
+       memset(ls->ls_recover_buf, 0, dlm_config.ci_buffer_size);
 
        send_rcom(ls, mh, rc);
 
@@ -241,7 +241,7 @@ static void receive_rcom_names(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 
        nodeid = rc_in->rc_header.h_nodeid;
        inlen = rc_in->rc_header.h_length - sizeof(struct dlm_rcom);
-       outlen = dlm_config.buffer_size - sizeof(struct dlm_rcom);
+       outlen = dlm_config.ci_buffer_size - sizeof(struct dlm_rcom);
 
        error = create_rcom(ls, nodeid, DLM_RCOM_NAMES_REPLY, outlen, &rc, &mh);
        if (error)

diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index cf9f6831bab57c34e9c733e4328a0c1a38ea534f..a7fa4cb6cd163d46dd6bd0759bf16d7506d968f1 100644 (file)
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -44,7 +44,7 @@
 static void dlm_wait_timer_fn(unsigned long data)
 {
        struct dlm_ls *ls = (struct dlm_ls *) data;
-       mod_timer(&ls->ls_timer, jiffies + (dlm_config.recover_timer * HZ));
+       mod_timer(&ls->ls_timer, jiffies + (dlm_config.ci_recover_timer * HZ));
        wake_up(&ls->ls_wait_general);
 }
 
@@ -55,7 +55,7 @@ int dlm_wait_function(struct dlm_ls *ls, int (*testfn) (struct dlm_ls *ls))
        init_timer(&ls->ls_timer);
        ls->ls_timer.function = dlm_wait_timer_fn;
        ls->ls_timer.data = (long) ls;
-       ls->ls_timer.expires = jiffies + (dlm_config.recover_timer * HZ);
+       ls->ls_timer.expires = jiffies + (dlm_config.ci_recover_timer * HZ);
        add_timer(&ls->ls_timer);
 
        wait_event(ls->ls_wait_general, testfn(ls) || dlm_recovery_stopped(ls));