[Cluster-devel] cluster/rgmanager/src/daemons rg_state.c

[lhh@sourceware.org <lhh@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-01-16 15:31:03

Modified files:
	rgmanager/src/daemons: rg_state.c 

Log message:
	Resolves: #222485; patch from Simone Gotti
	Makes relocation work correctly.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_state.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.24.2.2&r2=1.24.2.3

--- cluster/rgmanager/src/daemons/rg_state.c	2006/12/14 22:17:43	1.24.2.2
+++ cluster/rgmanager/src/daemons/rg_state.c	2007/01/16 15:31:03	1.24.2.3
@@ -1292,7 +1292,7 @@
 		    int *new_owner)
 {
 	cluster_member_list_t *allowed_nodes, *backup = NULL;
-	uint32_t target = preferred_target, me = my_id();
+	int target = preferred_target, me = my_id();
 	int ret, x;
 	
 	/*
@@ -1308,7 +1308,7 @@
 			return RG_EFORWARD;
 	}
 
-	if (preferred_target != 0) {
+	if (preferred_target >= 0) {
 
 		allowed_nodes = member_list();
 		/*
@@ -1380,7 +1380,7 @@
 		//count_resource_groups(allowed_nodes);
 	}
 
-	if (preferred_target != 0)
+	if (preferred_target >= 0)
 		memb_mark_down(allowed_nodes, preferred_target);
 	memb_mark_down(allowed_nodes, me);