cluster: RHEL6 - qdiskd: Fix bad timer check

[Fabio M. Di Nitto]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        4fe4dbb1e1261b2cfa471840134f27043f683385
Parent:        6c97937613317137f34286656068b5ee33108198
Author:        Lon Hohberger <lhh(a)redhat.com&gt;
AuthorDate:    Thu Mar 3 17:39:10 2011 -0500
Committer:     Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
CommitterDate: Fri Mar 18 09:39:33 2011 +0100

qdiskd: Fix bad timer check

Resolves: rhbz#679274
Resolves: rhbz#688154

Signed-off-by: Lon Hohberger <lhh(a)redhat.com&gt;
Tested-by: Masanari Iida <masanari_iida(a)hp.com&gt;
Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
---
 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;