From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 27 Nov 2006 22:21:30 -0000
Subject: [Cluster-devel] cluster/rgmanager/src/daemons groups.c
Message-ID: <20061127222130.12179.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2006-11-27 22:21:30

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

Log message:
	Fix #192117 - patch ported to RHEL4 from head by Lenny Maiorani

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/groups.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.8.2.17&r2=1.8.2.18

--- cluster/rgmanager/src/daemons/groups.c	2006/06/16 19:57:52	1.8.2.17
+++ cluster/rgmanager/src/daemons/groups.c	2006/11/27 22:21:30	1.8.2.18
@@ -879,8 +879,19 @@
 		if (curr->rn_resource->r_flags & RF_NEEDSTART)
 			need_init = 1;
 
-		if (get_rg_state_local(name, &svcblk) < 0) {
-			continue;
+		if (!need_init) {
+			if (get_rg_state_local(name, &svcblk) < 0)
+				continue;
+		} else {
+			if (rg_lock(name, &lockp) != 0)
+				continue;
+
+			if (get_rg_state(name, &svcblk) < 0) {
+				rg_unlock(name, lockp);
+				continue;
+			}
+
+			rg_unlock(name, lockp);
 		}
 
 		if (!need_init && svcblk.rs_owner != my_id()) {