Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=a4d6a6aa6ba6bd... Commit: a4d6a6aa6ba6bd8d610d42fdb518089efa4112ee Parent: 8f339d0e5c151c6e444c0108b98a8c3b63fd28b8 Author: Ryan McCabe rmccabe@redhat.com AuthorDate: Fri Oct 12 21:14:19 2012 -0400 Committer: Ryan McCabe rmccabe@redhat.com CommitterDate: Mon Oct 15 09:38:04 2012 -0400

rgmanager: Fix return code when a service would deadlock

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

Acked-by: Fabio M. Di Nitto fdinitto@redhat.com Signed-off-by: Ryan McCabe rmccabe@redhat.com --- rgmanager/src/daemons/rg_thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

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,