From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 22 Mar 2007 23:24:06 -0000
Subject: [Cluster-devel] cluster/rgmanager/src/daemons restree.c
Message-ID: <20070322232406.13736.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: 	STABLE
Changes by:	lhh at sourceware.org	2007-03-22 23:24:06

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

Log message:
	Fix 212121, pass 4

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/restree.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.10.2.2.6.10&r2=1.10.2.2.6.11

--- cluster/rgmanager/src/daemons/restree.c	2007/03/20 19:44:25	1.10.2.2.6.10
+++ cluster/rgmanager/src/daemons/restree.c	2007/03/22 23:24:06	1.10.2.2.6.11
@@ -46,6 +46,9 @@
 int _res_op(resource_node_t **tree, resource_t *first, char *type,
 	    void * __attribute__((unused))ret, int op);
 void print_env(char **env);
+static inline int _res_op_internal(resource_node_t **tree, resource_t *first,
+		 char *type, void *__attribute__((unused))ret, int realop,
+		 resource_node_t *node);
 
 /* XXX from reslist.c */
 void * act_dup(resource_act_t *acts);
@@ -947,8 +950,8 @@
 
 
 static inline int
-_xx_child_internal(resource_node_t *node, resource_node_t *child, void *ret,
-		   int op)
+_xx_child_internal(resource_node_t *node, resource_t *first,
+		   resource_node_t *child, void *ret, int op)
 {
 	int x;
 	resource_rule_t *rule = node->rn_resource->r_rule;
@@ -964,7 +967,7 @@
 		}
 	}
 
-	return _res_op_internal(&child, child->rn_resource,
+	return _res_op_internal(&child, first,
 	 		       child->rn_resource->r_rule->rr_type,
 			       ret, op, child);
 }
@@ -979,13 +982,13 @@
 
 	if (op == RS_START || op == RS_STATUS) {
 		list_for(&node->rn_child, child, y) {
-			rv = _xx_child_internal(node, child, ret, op);
+			rv = _xx_child_internal(node, first, child, ret, op);
 			if (rv)
 				return rv;
 		}
 	} else {
 		list_for_rev(&node->rn_child, child, y) {
-			rv += _xx_child_internal(node, child, ret, op);
+			rv += _xx_child_internal(node, first, child, ret, op);
 		}
 	}