Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46b43eed authored by David Teigland's avatar David Teigland
Browse files

dlm: reject messages from non-members 



Messages from nodes that are no longer members of the lockspace should be
ignored.  When nodes are removed from the lockspace, recovery can
sometimes complete quickly enough that messages arrive from a removed node
after recovery has completed.  When processed, these messages would often
cause an error message, and could in some cases change some state, causing
problems.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent aec64e1b

fs/dlm/lock.c

+8 −1
Original line number Diff line number Diff line 
/******************************************************************************

*******************************************************************************

**

**  Copyright (C) 2005-2007 Red Hat, Inc.  All rights reserved.

**  Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.

**

**  This copyrighted material is made available to anyone wishing to use,

**  modify, copy, or redistribute it subject to the terms and conditions
@@ -3643,6 +3643,13 @@ static void receive_lookup_reply(struct dlm_ls *ls, struct dlm_message *ms) 


static void _receive_message(struct dlm_ls *ls, struct dlm_message *ms)

{

	if (!dlm_is_member(ls, ms->m_header.h_nodeid)) {

		log_debug(ls, "ignore non-member message %d from %d %x %x %d",

			  ms->m_type, ms->m_header.h_nodeid, ms->m_lkid,

			  ms->m_remid, ms->m_result);

		return;

	}



	switch (ms->m_type) {



	/* messages sent to a master node */

fs/dlm/member.c

+2 −2
Original line number Diff line number Diff line 
/******************************************************************************

*******************************************************************************

**

**  Copyright (C) 2005-2007 Red Hat, Inc.  All rights reserved.

**  Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.

**

**  This copyrighted material is made available to anyone wishing to use,

**  modify, copy, or redistribute it subject to the terms and conditions
@@ -70,7 +70,7 @@ static void dlm_remove_member(struct dlm_ls *ls, struct dlm_member *memb) 
	ls->ls_num_nodes--;

}



static int dlm_is_member(struct dlm_ls *ls, int nodeid)

int dlm_is_member(struct dlm_ls *ls, int nodeid)

{

	struct dlm_member *memb;

fs/dlm/member.h

+2 −1
Original line number Diff line number Diff line 
/******************************************************************************

*******************************************************************************

**

**  Copyright (C) 2005 Red Hat, Inc.  All rights reserved.

**  Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.

**

**  This copyrighted material is made available to anyone wishing to use,

**  modify, copy, or redistribute it subject to the terms and conditions
@@ -19,6 +19,7 @@ void dlm_clear_members(struct dlm_ls *ls); 
void dlm_clear_members_gone(struct dlm_ls *ls);

int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv,int *neg_out);

int dlm_is_removed(struct dlm_ls *ls, int nodeid);

int dlm_is_member(struct dlm_ls *ls, int nodeid);



#endif                          /* __MEMBER_DOT_H__ */