cluster: RHEL6 - Revert "Apply patch from John Ruemker to resolve rhbz#803474"
Fabio M. Di Nitto
fabbione at fedoraproject.org
Tue Apr 10 04:16:21 UTC 2012
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=24d54d2abb33c858b28e6d53d03e1b243881657b
Commit: 24d54d2abb33c858b28e6d53d03e1b243881657b
Parent: cd9d9be98b4276c4e73eac81563f54e92a08045d
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate: Tue Apr 10 06:16:08 2012 +0200
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Apr 10 06:16:08 2012 +0200
Revert "Apply patch from John Ruemker to resolve rhbz#803474"
This reverts commit cd9d9be98b4276c4e73eac81563f54e92a08045d.
---
rgmanager/src/daemons/main.c | 8 +-------
rgmanager/src/daemons/rg_event.c | 4 ++--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 9a1e5e9..94047c3 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -456,13 +456,7 @@ dispatch_msg(msgctx_t *ctx, int nodeid, int need_close)
/* Centralized processing or request is from
clusvcadm */
nid = event_master();
- if (nid < 0) {
- logt_print(LOG_ERR, "#40b: Unable to determine "
- "event master\n");
- ret = -1;
- goto out;
- }
- else if (nid != my_id()) {
+ if (nid != my_id()) {
/* Forward the message to the event master */
forward_message(ctx, msg_sm, nid);
} else {
diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c
index e6a2abd..7048bc6 100644
--- a/rgmanager/src/daemons/rg_event.c
+++ b/rgmanager/src/daemons/rg_event.c
@@ -247,7 +247,7 @@ static int
find_master(void)
{
event_master_t *masterinfo = NULL;
- void *data = NULL;
+ void *data;
uint32_t sz;
cluster_member_list_t *m;
uint64_t vn;
@@ -255,7 +255,7 @@ find_master(void)
m = member_list();
if (vf_read(m, "Transition-Master", &vn,
- (void **)(&data), &sz) != VFR_OK) {
+ (void **)(&data), &sz) < 0) {
logt_print(LOG_ERR, "Unable to discover master"
" status\n");
masterinfo = NULL;
More information about the cluster-commits
mailing list