cluster: RHEL57 - qdiskd: Fix bad timer check - RHEL5
Lon Hohberger
lon at fedoraproject.org
Mon Mar 21 23:11:45 UTC 2011
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ec8361d744d079be5c9c146e8a8b0762a9810275
Commit: ec8361d744d079be5c9c146e8a8b0762a9810275
Parent: 4c5fdf002d5f409c8a1acbba4a290c13b5d1e7e4
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Thu Mar 3 17:39:10 2011 -0500
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Mar 21 19:00:40 2011 -0400
qdiskd: Fix bad timer check - RHEL5
Resolves: rhbz#679274
Signed-off-by: Lon Hohberger <lhh at redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto at redhat.com>
Tested-by: Masanari Iida <masanari_iida at 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 2e8993d..1907e4a 100644
--- a/cman/qdisk/score.c
+++ b/cman/qdisk/score.c
@@ -107,7 +107,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;
More information about the cluster-commits
mailing list