Commit 1c032c03 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[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: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarPatrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ae118962

fs/dlm/config.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

fs/dlm/lowcomms.c

+21 −0
Original line number Diff line number Diff line
@@ -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;

fs/dlm/lowcomms.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

fs/dlm/member.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "member.h"

#include "recoverd.h"

#include "recover.h"

#include "lowcomms.h"

#include "rcom.h"

#include "config.h"