Attachment 150702 Details for Bug 212121 – Incremental patch against 150405 which fixes incorrect start problem

Incremental patch against 150405 which fixes incorrect start problem

rgmanager-212121-4.patch (text/x-patch), 1.64 KB, created by Lon Hohberger on 2007-03-22 22:14:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2007-03-22 22:14:41 UTC

Size: 1.64 KB

patch

obsolete

>Index: src/daemons/restree.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/restree.c,v
>retrieving revision 1.10.2.14
>diff -u -r1.10.2.14 restree.c
>--- src/daemons/restree.c	20 Mar 2007 19:40:06 -0000	1.10.2.14
>+++ src/daemons/restree.c	22 Mar 2007 22:12:41 -0000
>@@ -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);
> 		}
> 	}
>

Actions: View

Attachments on bug 212121: 149651 | 150405 | 150702 | 153997