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

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2006-06-16 20:11:34

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

Log message:
	Fix #193859

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.18&r2=1.5.2.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/restree.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.10.2.9&r2=1.10.2.10

--- cluster/rgmanager/ChangeLog	2006/06/16 19:57:52	1.5.2.18
+++ cluster/rgmanager/ChangeLog	2006/06/16 20:11:33	1.5.2.19
@@ -2,6 +2,8 @@
 	* src/daemons/fo_domain.c, groups.c: Get rid of compiler warnings
 	* src/daemons/rg_state.c: Change clu_lock_verbose to use the NULL
 	lock/convert mechanism offered by DLM to work around #193128
+	* src/daemons/restree.c: Apply patch from Navid Sheikhol-Eslami
+	(navid at redhat.com) to fix #193859
 	* src/resources/fs.sh, clusterfs.sh, nfsexport.sh, nfsclient.sh,
 	service.sh, svclib_nfslock: Finish up initial NFS workaround.
 
--- cluster/rgmanager/src/daemons/restree.c	2006/05/12 21:28:31	1.10.2.9
+++ cluster/rgmanager/src/daemons/restree.c	2006/06/16 20:11:33	1.10.2.10
@@ -702,18 +702,18 @@
 #endif
 
 			/* Do op on all children at our level */
-			rv = _res_op(&node->rn_child, first,
+			rv += _res_op(&node->rn_child, first,
 			     	     rule->rr_childtypes[x].rc_name, 
 		     		     ret, op);
-			if (rv != 0)
+			if (rv != 0 && op != RS_STOP)
 				return rv;
 		}
 
-		if (rv != 0)
+		if (rv != 0 && op != RS_STOP)
 			return rv;
 	}
 
-	return 0;
+	return rv;
 }