From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Wed, 12 Jan 2011 16:41:32 +0100
Subject: [Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified
 in	cluster.conf
In-Reply-To: <1294844479-7231-1-git-send-email-lhh@redhat.com>
References: <1294844479-7231-1-git-send-email-lhh@redhat.com>
Message-ID: <4D2DCBAC.1080903@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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);
>