master - cman: Revert dirty patch

master - cman: Revert dirty patch

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e5885fd588a0608ddf00ad03ee3289a1b0c9f656
Commit:        e5885fd588a0608ddf00ad03ee3289a1b0c9f656
Parent:        c91f6ca13c5b67b9b111c50d4455fe0110b52274
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Fri Aug 1 10:14:31 2008 +0100
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Fri Aug 1 10:14:31 2008 +0100

cman: Revert dirty patch

Revert patch 288ab73e51f51ce174f51dc2fc67c6dd1fe03e85 as it's
dangerously wrong and based on several misunderstandings.

see bz#443358 for mroe information

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 c37d38b..d814d76 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1778,8 +1778,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) {