From mboxrd@z Thu Jan  1 00:00:00 1970
From: swhiteho@redhat.com <swhiteho@redhat.com>
Date: Mon,  9 Jul 2007 17:02:32 +0100
Subject: [Cluster-devel] [PATCH] [DLM] fix socket shutdown
In-Reply-To: <11839970403929-git-send-email-swhiteho@redhat.com>
References: <11839969822277-git-send-email-swhiteho@redhat.com>
	<1183996989263-git-send-email-swhiteho@redhat.com>
	<11839969911617-git-send-email-swhiteho@redhat.com>
	<1183996996300-git-send-email-swhiteho@redhat.com>
	<11839969982134-git-send-email-swhiteho@redhat.com>
	<11839970003764-git-send-email-swhiteho@redhat.com>
	<11839970032102-git-send-email-swhiteho@redhat.com>
	<11839970052865-git-send-email-swhiteho@redhat.com>
	<11839970061096-git-send-email-swhiteho@redhat.com>
	<1183997008395-git-send-email-swhiteho@redhat.com>
	<11839970101065-git-send-email-swhiteho@redhat.com>
	<11839970122624-git-send-email-swhiteho@redhat.com>
	<11839970143164-git-send-email-swhiteho@redhat.com>
	<11839970162125-git-send-email-swhiteho@redhat.com>
	<11839970182635-git-send-email-swhiteho@redhat.com>
	<11839970204036-git-send-email-swhiteho@redhat.com>
	<11839970222606-git-send-email-swhiteho@redhat.com>
	<11839970241526-git-send-email-swhiteho@redhat.com>
	<1183997026104-git-send-email-swhiteho@redhat.com>
	<11839970282009-git-send-email-swhiteho@redhat.com>
	<11839970302426-git-send-email-swhiteho@redhat.com>
	<11839970324005-git-send-email-swhiteho@redhat.com>
	<1183997034982-git-send-email-swhiteho@redhat.com>
	<1183997036270-git-send-email-swhiteho@redhat.com>
	<11839970383020-git-send-email-swhiteho@redhat.com>
	<11839970403929-git-send-email-swhiteho@redhat.com>
Message-ID: <11839970421091-git-send-email-swhiteho@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

From: Patrick Caulfield <pcaulfie@redhat.com>

This patch clears the user_data of active sockets as part of cleanup.
This prevents any late-arriving data from trying to add jobs to the work
queue while we are tidying up.

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-Off-By: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 27970a5..fc0bff7 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -260,7 +260,7 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr)
 static void lowcomms_data_ready(struct sock *sk, int count_unused)
 {
 	struct connection *con = sock2con(sk);
-	if (!test_and_set_bit(CF_READ_PENDING, &con->flags))
+	if (con && !test_and_set_bit(CF_READ_PENDING, &con->flags))
 		queue_work(recv_workqueue, &con->rwork);
 }
 
@@ -268,7 +268,7 @@ static void lowcomms_write_space(struct sock *sk)
 {
 	struct connection *con = sock2con(sk);
 
-	if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags))
+	if (con && !test_and_set_bit(CF_WRITE_PENDING, &con->flags))
 		queue_work(send_workqueue, &con->swork);
 }
 
@@ -1400,8 +1400,11 @@ void dlm_lowcomms_stop(void)
 	down(&connections_lock);
 	for (i = 0; i <= max_nodeid; i++) {
 		con = __nodeid2con(i, 0);
-		if (con)
+		if (con) {
 			con->flags |= 0xFF;
+			if (con->sock)
+				con->sock->sk->sk_user_data = NULL;
+		}
 	}
 	up(&connections_lock);
 
-- 
1.5.1.2