summaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-04-28 10:50:41 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-28 10:50:41 -0400
commit1c032c03117c014512195f2e33c3af999f132146 (patch)
tree2032d1965331fb1882fdb306c678cf4497b35c10 /fs/dlm
parentae118962b9f8572b5ff00e85c053dbeede2314db (diff)
downloadlinux-1c032c03117c014512195f2e33c3af999f132146.tar.gz
linux-1c032c03117c014512195f2e33c3af999f132146.tar.bz2
linux-1c032c03117c014512195f2e33c3af999f132146.zip
[DLM] PATCH 2/3 dlm: lowcomms close
When a node is removed from a lockspace configuration, close our connection to it, clearing any remaining messages for it. Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/config.c2
-rw-r--r--fs/dlm/lowcomms.c21
-rw-r--r--fs/dlm/lowcomms.h1
-rw-r--r--fs/dlm/member.c1
4 files changed, 24 insertions, 1 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 87df9616415e..88553054bbfa 100644
--- a/fs/dlm/config.c
+++ b/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/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 09b0124f7fc4..cdd168e4bf45 100644
--- a/fs/dlm/lowcomms.c
+++ b/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/fs/dlm/lowcomms.h b/fs/dlm/lowcomms.h
index 3af8035ff12f..6c04bb09cfa8 100644
--- a/fs/dlm/lowcomms.h
+++ b/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/fs/dlm/member.c b/fs/dlm/member.c
index 926cd0cb6bff..cd0c51e724e0 100644
--- a/fs/dlm/member.c
+++ b/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"