Cluster Project branch, master, updated. gfs-kernel_0_1_22-90-g3a0c7d3

Cluster Project branch, master, updated. gfs-kernel_0_1_22-90-g3a0c7d3

[lhh]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3a0c7d3e8b81ca339fbab9fb8d17f76991b1e358

The branch, master has been updated
       via  3a0c7d3e8b81ca339fbab9fb8d17f76991b1e358 (commit)
      from  5802dd9743d7a020d1a9bc47da2dccdbc39a6514 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3a0c7d3e8b81ca339fbab9fb8d17f76991b1e358
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Mar 20 17:25:02 2008 -0400

    [cman] Apply missing fix for #315711

-----------------------------------------------------------------------

Summary of changes:
 group/dlm_controld/member_cman.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/group/dlm_controld/member_cman.c b/group/dlm_controld/member_cman.c
index 6fb5c4f..1ce180c 100644
--- a/group/dlm_controld/member_cman.c
+++ b/group/dlm_controld/member_cman.c
@@ -84,6 +84,14 @@ static void statechange(void)
 		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)) {


hooks/post-receive
--
Cluster Project