From 1a7495f3d67d543f85d7ef821852aae69b0381e3 Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Mon, 20 Aug 2007 15:13:38 +0100 Subject: [PATCH] --- yaml --- r: 67669 b: refs/heads/master c: 61d96be0f474df354c2ff4a2b2bf410b23a5cd60 h: refs/heads/master i: 67667: acb3d41e17690352b87a6b429831625731417e2e v: v3 --- [refs] | 2 +- trunk/fs/dlm/lowcomms.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 3618cd789628..d2c7f03a43b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a13b8c5f2381495879e6facd3b3ada51c9e68194 +refs/heads/master: 61d96be0f474df354c2ff4a2b2bf410b23a5cd60 diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c index 9e9d2e82f40f..62a8a6ccd992 100644 --- a/trunk/fs/dlm/lowcomms.c +++ b/trunk/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;