cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Fabio M. Di Nitto <fdinitto@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in	cluster.conf
Date: Wed, 12 Jan 2011 16:41:32 +0100	[thread overview]
Message-ID: <4D2DCBAC.1080903@redhat.com> (raw)
In-Reply-To: <1294844479-7231-1-git-send-email-lhh@redhat.com>

ACK?ed

Fabio

On 1/12/2011 4:01 PM, Lon Hohberger wrote:
> This is a clean cherry-pick in to the RHEL6 branch.
> 
> Resolves: rhbz#663433
> 
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
> ---
>  cman/qdisk/main.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
> index 78dc3f0..73138b2 100644
> --- a/cman/qdisk/main.c
> +++ b/cman/qdisk/main.c
> @@ -1386,10 +1386,11 @@ auto_qdisk_votes(int desc)
>  			"/cluster/clusternodes/clusternode[%d]/@votes", ret);
>  
>  		name = NULL;
> -		if (ccs_get(desc, buf, &name) != 0)
> -			break;
> +		if (ccs_get(desc, buf, &name) == 0)
> +			votes = atoi(name);
> +		else
> +			votes = 1;
>  
> -		votes=atoi(name);
>  		if (votes != 1) {
>  			free(name);
>  



  reply	other threads:[~2011-01-12 15:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-12 15:01 [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf Lon Hohberger
2011-01-12 15:41 ` Fabio M. Di Nitto [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-01-12 15:09 Lon Hohberger

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=4D2DCBAC.1080903@redhat.com \
    --to=fdinitto@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 NNTP newsgroup(s).