From 407ccf14626d7532948f7fe72d4ac8930bcab946 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Fri, 28 Apr 2006 10:50:41 -0400
Subject: [PATCH] --- yaml --- r: 38675 b: refs/heads/master c:
 1c032c03117c014512195f2e33c3af999f132146 h: refs/heads/master i:   38673:
 f244d3b0b63eec506d953935e2916ea1d2b876a5   38671:
 9b99f83621a9fadaa0f15b9234ac96fdb25a83f1 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/dlm/config.c   |  2 ++
 trunk/fs/dlm/lowcomms.c | 21 +++++++++++++++++++++
 trunk/fs/dlm/lowcomms.h |  1 +
 trunk/fs/dlm/member.c   |  1 -
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bf082f761db5..dc674851d3fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae118962b9f8572b5ff00e85c053dbeede2314db
+refs/heads/master: 1c032c03117c014512195f2e33c3af999f132146
diff --git a/trunk/fs/dlm/config.c b/trunk/fs/dlm/config.c
index 87df9616415e..88553054bbfa 100644
--- a/trunk/fs/dlm/config.c
+++ b/trunk/fs/dlm/config.c
@@ -17,6 +17,7 @@
 #include <net/sock.h>
 
 #include "config.h"
+#include "lowcomms.h"
 
 /*
  * /config/dlm/<cluster>/spaces/<space>/nodes/<node>/nodeid
@@ -429,6 +430,7 @@ static void drop_comm(struct config_group *g, struct config_item *i)
 	struct comm *cm = to_comm(i);
 	if (local_comm == cm)
 		local_comm = NULL;
+	dlm_lowcomms_close(cm->nodeid);
 	while (cm->addr_count--)
 		kfree(cm->addr[cm->addr_count]);
 	config_item_put(i);
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
index 09b0124f7fc4..cdd168e4bf45 100644
--- a/trunk/fs/dlm/lowcomms.c
+++ b/trunk/fs/dlm/lowcomms.c
@@ -1063,6 +1063,27 @@ static void dealloc_nodeinfo(void)
 	}
 }
 
+int dlm_lowcomms_close(int nodeid)
+{
+	struct nodeinfo *ni;
+
+	ni = nodeid2nodeinfo(nodeid, 0);
+	if (!ni)
+		return -1;
+
+	spin_lock(&ni->lock);
+	if (ni->assoc_id) {
+		ni->assoc_id = 0;
+		/* Don't send shutdown here, sctp will just queue it
+		   till the node comes back up! */
+	}
+	spin_unlock(&ni->lock);
+
+	clean_one_writequeue(ni);
+	clear_bit(NI_INIT_PENDING, &ni->flags);
+	return 0;
+}
+
 static int write_list_empty(void)
 {
 	int status;
diff --git a/trunk/fs/dlm/lowcomms.h b/trunk/fs/dlm/lowcomms.h
index 3af8035ff12f..6c04bb09cfa8 100644
--- a/trunk/fs/dlm/lowcomms.h
+++ b/trunk/fs/dlm/lowcomms.h
@@ -18,6 +18,7 @@ int dlm_lowcomms_init(void);
 void dlm_lowcomms_exit(void);
 int dlm_lowcomms_start(void);
 void dlm_lowcomms_stop(void);
+int dlm_lowcomms_close(int nodeid);
 void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc);
 void dlm_lowcomms_commit_buffer(void *mh);
 
diff --git a/trunk/fs/dlm/member.c b/trunk/fs/dlm/member.c
index 926cd0cb6bff..cd0c51e724e0 100644
--- a/trunk/fs/dlm/member.c
+++ b/trunk/fs/dlm/member.c
@@ -15,7 +15,6 @@
 #include "member.h"
 #include "recoverd.h"
 #include "recover.h"
-#include "lowcomms.h"
 #include "rcom.h"
 #include "config.h"