From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu, 17 Mar 2011 23:42:33 +0100
Subject: [Cluster-devel] [PATCH] qdiskd: Fix bad timer check - RHEL6
In-Reply-To: <1300379676-24816-1-git-send-email-lhh@redhat.com>
References: <1300379676-24816-1-git-send-email-lhh@redhat.com>
Message-ID: <4D828E59.30301@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

Both rhel5 and 6 ACK.

Fabio

On 03/17/2011 05:34 PM, Lon Hohberger wrote:
> Resolves: rhbz#688154
> 
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
> Tested-by: Masanari Iida <masanari_iida@hp.com>
> ---
>  cman/qdisk/score.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/cman/qdisk/score.c b/cman/qdisk/score.c
> index 572464d..3ca531f 100644
> --- a/cman/qdisk/score.c
> +++ b/cman/qdisk/score.c
> @@ -86,7 +86,8 @@ fork_heuristic(struct h_data *h, struct timespec *now)
>  	}
>  
>  	if (now->tv_sec < h->nextrun.tv_sec ||
> -	    now->tv_nsec < h->nextrun.tv_nsec)
> +	    ((now->tv_sec == h->nextrun.tv_sec) &&
> +	     (now->tv_nsec < h->nextrun.tv_nsec)))
>  		return 0;
>  
>  	h->nextrun.tv_sec = now->tv_sec + h->interval;