[Cluster-devel] cluster/magma-plugins/sm services.c sm.c

[Cluster-devel] cluster/magma-plugins/sm services.c sm.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-01-03 21:09:09

Modified files:
	magma-plugins/sm: services.c sm.c 

Log message:
	Resolves: 201396
	Part 2: Fix a bug in magma-plugins due to a mismatched count if a node died while waiting for a remote request to complete.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/magma-plugins/sm/services.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.4.2.5&r2=1.4.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/magma-plugins/sm/sm.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.9.2.10&r2=1.9.2.11

--- cluster/magma-plugins/sm/Attic/services.c	2006/05/15 16:59:11	1.4.2.5
+++ cluster/magma-plugins/sm/Attic/services.c	2007/01/03 21:09:09	1.4.2.6
@@ -252,9 +252,10 @@
 		return NULL;
 	}
 
-	foo->cml_count = group_count;
+	foo->cml_count = group_count < cman_nl.max_members ?
+			 group_count : cman_nl.max_members;
 	for (x = 0, y = 0; (x < cman_nl.max_members) &&
-			   (y < group_count); x++) {
+			   (y < foo->cml_count); x++) {
 		if (!_is_member(member_ids, group_count,
 		    		 cman_nl.nodes[x].node_id))
 			continue;
--- cluster/magma-plugins/sm/Attic/sm.c	2006/09/07 18:41:23	1.9.2.10
+++ cluster/magma-plugins/sm/Attic/sm.c	2007/01/03 21:09:09	1.9.2.11
@@ -36,7 +36,7 @@
 #include <sys/select.h>
 #include <sys/stat.h>
 
-#define MODULE_DESCRIPTION "CMAN/SM Plugin v1.1.7.2"
+#define MODULE_DESCRIPTION "CMAN/SM Plugin v1.1.7.3"
 #define MODULE_AUTHOR      "Lon Hohberger"
 
 #define DLM_LS_NAME	   "Magma"