[Cluster-devel] cluster/group/dlm_controld member_cman.c

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-10-05 14:20:33

Modified files:
	group/dlm_controld: member_cman.c 

Log message:
	Fix #315711 - dlm_controld needs to ignore node ID 0 to make qdisk work

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/member_cman.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.3&r2=1.4.2.4

--- cluster/group/dlm_controld/member_cman.c	2007/05/04 21:14:32	1.4.2.3
+++ cluster/group/dlm_controld/member_cman.c	2007/10/05 14:20:33	1.4.2.4
@@ -82,6 +82,14 @@
 		return;
 	}
 
+	/* Never allow node ID 0 to be considered a member #315711 */
+	for (i = 0; i < cman_node_count; i++) {
+		if (cman_nodes[i].cn_nodeid == 0) {
+			cman_nodes[i].cn_member = 0;
+			break;
+		}
+	}
+
 	for (i = 0; i < old_node_count; i++) {
 		if (old_nodes[i].cn_member &&
 		    !is_cman_member(old_nodes[i].cn_nodeid)) {