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

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL51
Changes by:	lhh at sourceware.org	2008-02-05 19:47:17

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

Log message:
	Fix #431520

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

--- cluster/rgmanager/src/daemons/rg_state.c	2008/01/25 16:04:51	1.24.2.10.2.4
+++ cluster/rgmanager/src/daemons/rg_state.c	2008/02/05 19:47:17	1.24.2.10.2.5
@@ -862,6 +862,12 @@
 		return RG_EFAIL;
 	}
 
+	if (svcStatus.rs_owner == target) {
+		rg_unlock(&lockp);
+		/* Do not allow migration to its current owner! */
+		return 0;
+	}
+
 	if (svcStatus.rs_owner != my_id()) {
 		rg_unlock(&lockp);
 		return RG_EFORWARD;