aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Caulfield <pcaulfie@redhat.com>2007-08-20 15:13:38 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2007-10-10 08:55:39 +0100
commit61d96be0f474df354c2ff4a2b2bf410b23a5cd60 (patch)
treeb40a06b75f7ff59b3925dcabbbf63605f7b18c18
parenta13b8c5f2381495879e6facd3b3ada51c9e68194 (diff)
downloadkernel_goldelico_gta04-61d96be0f474df354c2ff4a2b2bf410b23a5cd60.zip
kernel_goldelico_gta04-61d96be0f474df354c2ff4a2b2bf410b23a5cd60.tar.gz
kernel_goldelico_gta04-61d96be0f474df354c2ff4a2b2bf410b23a5cd60.tar.bz2
[DLM] Fix lowcomms socket closing
This patch fixes the slight mess made in lowcomms closing by previous patches and fixes all sorts of DLM hangs. Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/dlm/lowcomms.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 9e9d2e8..62a8a6c 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -334,18 +334,8 @@ static void close_connection(struct connection *con, bool and_other)
con->rx_page = NULL;
}
- /* If we are an 'othercon' then NULL the pointer to us
- from the parent and tidy ourself up */
- if (test_bit(CF_IS_OTHERCON, &con->flags)) {
- struct connection *parent = __nodeid2con(con->nodeid, 0);
- parent->othercon = NULL;
- kmem_cache_free(con_cache, con);
- }
- else {
- /* Parent connections get reused */
- con->retries = 0;
- mutex_unlock(&con->sock_mutex);
- }
+ con->retries = 0;
+ mutex_unlock(&con->sock_mutex);
}
/* We only send shutdown messages to nodes that are not part of the cluster */
@@ -731,6 +721,8 @@ static int tcp_accept_from_sock(struct connection *con)
INIT_WORK(&othercon->swork, process_send_sockets);
INIT_WORK(&othercon->rwork, process_recv_sockets);
set_bit(CF_IS_OTHERCON, &othercon->flags);
+ }
+ if (!othercon->sock) {
newcon->othercon = othercon;
othercon->sock = newsock;
newsock->sk->sk_user_data = othercon;