public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: cluster: RHEL5 - rgmanager: Fix bad manual merge in rg_state.c
Date: Fri, 27 Mar 2009 15:36:00 -0000	[thread overview]
Message-ID: <20090327153625.7454C120150@lists.fedorahosted.org> (raw)

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0358149f71b17247c6109fc1d31e71bdf264cf33
Commit:        0358149f71b17247c6109fc1d31e71bdf264cf33
Parent:        49e8d4b32390184b1794b90b11865d8d60ee352d
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Fri Mar 27 11:34:01 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Mar 27 11:34:01 2009 -0400

rgmanager: Fix bad manual merge in rg_state.c

Introduced in 6c86348ae517dcb8d449343ae3d69f8cf41568ef

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/daemons/rg_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 73fe5dc..cda9130 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -2111,7 +2111,7 @@ handle_start_remote_req(char *svcName, int req)
 
 	x = svc_start(svcName, req);
 
-	if ((x == 0) || (x == RG_ERUN) (x == RG_EFROZEN)) {
+	if ((x == 0) || (x == RG_ERUN) || (x == RG_EFROZEN)) {
 		if (need_check)
 			pthread_mutex_unlock(&exclusive_mutex);
 		return x;


                 reply	other threads:[~2009-03-27 15:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090327153625.7454C120150@lists.fedorahosted.org \
    --to=lon@fedoraproject.org \
    --cc=cluster-cvs-relay@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).