From bc59b438ea193b468c2c2677a3b47cd9accb48a1 Mon Sep 17 00:00:00 2001
From: Xue Ying <ying.xue@windriver.com>
Date: Fri, 10 Aug 2012 10:58:37 +0800
Subject: [PATCH] --- yaml --- r: 326216 b: refs/heads/master c:
 b4c798cf695dc7cee9798a686128461ad0070115 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/dlm/lowcomms.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b988ddf06ec0..1ad25c0010b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 475f230c6072fb2186f48b23943afcd0ee3a8343
+refs/heads/master: b4c798cf695dc7cee9798a686128461ad0070115
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
index 522a69fccd84..3e6aaccce951 100644
--- a/trunk/fs/dlm/lowcomms.c
+++ b/trunk/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);