From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Sat, 13 Oct 2012 08:26:57 +0200
Subject: [Cluster-devel] [PATCH] rgmanager: Fix return code when a
 service would deadlock
In-Reply-To: <20121013011828.GA294584@redhat.com>
References: <20121013011828.GA294584@redhat.com>
Message-ID: <507909B1.4090004@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

On 10/13/2012 03:18 AM, Ryan McCabe wrote:
> When we detect that starting a service would cause a deadlock, return 0
> instead of -1. This fixes a crash that occurred when -1 was returned.
> 
> Resolves: rhbz#861157
> 
> Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
> ---
>  rgmanager/src/daemons/rg_thread.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c
> index 5e551c3..b888717 100644
> --- a/rgmanager/src/daemons/rg_thread.c
> +++ b/rgmanager/src/daemons/rg_thread.c
> @@ -756,7 +756,7 @@ rt_enqueue_request(const char *resgroupname, int request,
>  		logt_print(LOG_DEBUG,
>  			"Failed to queue %d request for %s: Would block\n",
>  			request, resgroupname);
> -		return -1;
> +		return 0;
>  	}
>  
>  	ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name,
>