summaryrefslogtreecommitdiffstats
path: root/fs/dlm/lowcomms-tcp.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2007-01-09 09:41:48 -0600
committerSteven Whitehouse <swhiteho@redhat.com>2007-02-05 13:36:37 -0500
commit68c817a1c4e21b893672ac73d8a498e6647453aa (patch)
tree12c0fe9bd087ac1a0189048a7f4535993d6cb697 /fs/dlm/lowcomms-tcp.c
parent8ec6886748443bec53ce9b9bf50cec92bc417a1b (diff)
downloadlinux-68c817a1c4e21b893672ac73d8a498e6647453aa.tar.gz
linux-68c817a1c4e21b893672ac73d8a498e6647453aa.tar.bz2
linux-68c817a1c4e21b893672ac73d8a498e6647453aa.zip
[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>
Diffstat (limited to 'fs/dlm/lowcomms-tcp.c')
-rw-r--r--fs/dlm/lowcomms-tcp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/dlm/lowcomms-tcp.c b/fs/dlm/lowcomms-tcp.c
index ce5e7cdfb45d..b4fb5783ef8a 100644
--- 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;