aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Ying <ying.xue@windriver.com>2012-08-10 10:58:37 +0800
committerDavid Teigland <teigland@redhat.com>2012-08-10 09:10:10 -0500
commitb4c798cf695dc7cee9798a686128461ad0070115 (patch)
tree920c1d11f1e2a5f141190cc01a828560ffc80d73
parent475f230c6072fb2186f48b23943afcd0ee3a8343 (diff)
downloadkernel_goldelico_gta04-b4c798cf695dc7cee9798a686128461ad0070115.zip
kernel_goldelico_gta04-b4c798cf695dc7cee9798a686128461ad0070115.tar.gz
kernel_goldelico_gta04-b4c798cf695dc7cee9798a686128461ad0070115.tar.bz2
dlm: remove redundant variable assignments
Once the tcp_create_listen_sock() is returned successfully, we will invoke add_sock() immediately. In add_sock(), the 'con' variable is assigned to 'sk_user_data', meanwhile, the 'sock' is also set to 'con->sock'. So it's unnecessary to do the same thing in tcp_create_listen_sock(). Signed-off-by: Xue Ying <ying.xue@windriver.com> Signed-off-by: David Teigland <teigland@redhat.com>
-rw-r--r--fs/dlm/lowcomms.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 522a69f..3e6aacc 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1175,10 +1175,8 @@ static struct socket *tcp_create_listen_sock(struct connection *con,
if (result < 0) {
log_print("Failed to set SO_REUSEADDR on socket: %d", result);
}
- sock->sk->sk_user_data = con;
con->rx_action = tcp_accept_from_sock;
con->connect_action = tcp_connect_to_sock;
- con->sock = sock;
/* Bind to our port */
make_sockaddr(saddr, dlm_config.ci_tcp_port, &addr_len);