[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH] Fix for #193859 from Navid Sheikhol-Eslami (navid at redhat)



I tested this and it works correctly; any objections to committing it?

-- Lon
--- rgmanager-1.9.46/src/daemons/restree.c	2006-06-14 08:12:12.000000000 +0100
+++ rgmanager-1.9.46/src/daemons/restree.c.fix	2006-06-14 08:13:22.000000000 +0100
@@ -701,18 +701,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;
 }
 
 

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]