STABLE2 - cman: revert dirty patch

STABLE2 - cman: revert dirty patch

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=89ff10632d43b91a64f2b2612cd6186a370a7268
Commit:        89ff10632d43b91a64f2b2612cd6186a370a7268
Parent:        405dbcb97c1dbd5136664948f96c2bec285ac489
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Fri Aug 1 10:24:09 2008 +0100
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Fri Aug 1 10:24:09 2008 +0100

cman: revert dirty patch

Revert patch b01cdba509d81b3a660ad85302765ee2294fad11

see bz#443358

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 cman/daemon/commands.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 13d06aa..9abcccb 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1721,8 +1721,7 @@ static void do_process_transition(int nodeid, char *data, int len)
 
 	/* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down
 	   and has state then we mark it disallowed because we cannot merge stateful nodes */
-	if (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN ||
-	    (us->flags & NODE_FLAGS_DIRTY && nodeid != us->node_id))) {
+	if (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) {
 		/* Don't duplicate messages */
 		if (node->state != NODESTATE_AISONLY) {
 			if (cluster_is_quorate) {