cluster: STABLE31 - rgmanager: Fix bad passing of SFL_FAILURE up

[Lon Hohberger]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        ead472031bf6d813b57580911ff70611bbc24dfb
Parent:        72fca398e2a0cd5eb08f575b415cf815c73a84ad
Author:        Lon Hohberger <lhh(a)redhat.com&gt;
AuthorDate:    Thu Jun 23 10:36:09 2011 -0400
Committer:     Lon Hohberger <lhh(a)redhat.com&gt;
CommitterDate: Thu Jun 23 13:43:12 2011 -0400

rgmanager: Fix bad passing of SFL_FAILURE up

We were handling failures at the 'highest' independent subtree
level instead of lowest; this patch fixes that.

Resolves: rhbz#711521
Resolves: rhbz#716231

Signed-off-by: Lon Hohberger <lhh(a)redhat.com&gt;
---
 rgmanager/src/daemons/restree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index 739bbc8..8ce1364 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1546,7 +1546,7 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 		  and all our children as failed and return a flag stating
 		  that this section is recoverable apart from siblings in
 		  the resource tree. */
-		if (op == RS_STATUS && (rv & (SFL_FAILURE|SFL_RECOVERABLE)) &&
+		if (op == RS_STATUS && (rv & SFL_FAILURE) &&
 		    (node->rn_flags & RF_INDEPENDENT)) {
 
 			rte = restart_threshold_exceeded(node->rn_restart_counter);