[Cluster-devel] cluster/group/daemon cman.c

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-06-30 21:00:33

Modified files:
	group/daemon   : cman.c 

Log message:
	put back old check that previous commit avoided

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/cman.c.diff?cvsroot=cluster&r1=1.26&r2=1.27

--- cluster/group/daemon/cman.c	2006/06/30 15:34:50	1.26
+++ cluster/group/daemon/cman.c	2006/06/30 21:00:33	1.27
@@ -92,8 +92,10 @@
 	for (i = 0; i < old_node_count; i++) {
 		if (old_nodes[i].cn_member &&
 		    !is_cman_member(old_nodes[i].cn_nodeid)) {
+
 			log_debug("cman: node %d removed",
 				  old_nodes[i].cn_nodeid);
+
 			rs = get_recovery_set(old_nodes[i].cn_nodeid);
 			rs->cman_update = 1;
 
@@ -102,7 +104,10 @@
 					  rs->nodeid);
 				list_del(&rs->list);
 				free(rs);
-			} else if (rs->cpg_update && list_empty(&rs->entries)) {
+				continue;
+			}
+
+			if (rs->cpg_update && list_empty(&rs->entries)) {
 				log_debug("free unused recovery set %d cman",
 					  rs->nodeid);
 				list_del(&rs->list);