cluster: STABLE32 - rgmanager: Fix dead code warnings
Fabio M. Di Nitto
fabbione at fedoraproject.org
Wed Aug 15 13:07:15 UTC 2012
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=69eefe3a7c3f715b41ec11647456c70df8aa1c96
Commit: 69eefe3a7c3f715b41ec11647456c70df8aa1c96
Parent: 06bed152ffb35a167ad77e31a3ee507439906bf7
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Fri Sep 16 14:21:10 2011 -0400
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Wed Aug 15 11:04:38 2012 +0200
rgmanager: Fix dead code warnings
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
rgmanager/src/daemons/fo_domain.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c
index 168d49b..382301f 100644
--- a/rgmanager/src/daemons/fo_domain.c
+++ b/rgmanager/src/daemons/fo_domain.c
@@ -445,8 +445,8 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
int nofailback = 0;
fod_t *fod = NULL;
int found = 0;
- int owned_by_node = 0, started = 0, no_owner = 0;
#ifndef NO_CCS
+ int owned_by_node = 0, started = 0, no_owner = 0;
rg_state_t svc_state;
struct dlm_lksb lockp;
#endif
@@ -600,6 +600,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
* If we are ordered we want to see if failback is
* turned on
*/
+#ifndef NO_CCS
if (nofailback && started && owned_by_node && !no_owner) {
#ifdef DEBUG
logt_print(LOG_DEBUG,"Ordered mode and no "
@@ -607,6 +608,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
#endif
return FOD_BEST;
}
+#endif
#ifdef DEBUG
logt_print(LOG_DEBUG,"Ordered mode -> BETTER\n");
#endif
@@ -622,7 +624,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
* Node is a member of the domain and is the lowest-ordered,
* online member.
*/
-
+#ifndef NO_CCS
if(nofailback && started && !owned_by_node && !no_owner) {
#ifdef DEBUG
logt_print(LOG_DEBUG, "Member #%d is the lowest-ordered "
@@ -631,6 +633,7 @@ node_should_start(int nodeid, cluster_member_list_t *membership,
#endif
return FOD_BETTER;
}
+#endif
/* In this case, we can ignore 'ordered' */
#ifdef DEBUG
More information about the cluster-commits
mailing list