X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=time.c;h=505058f53b270f973482bdd839245d6239d69e99;hb=1cb05ed57fd364669a10e5eda4df790fbd49fa57;hp=c6a6287819e83b601ac0584db0b716e4dd6acec4;hpb=64b18e125219430fbfe69e61642dbcaa1861434e;p=fio.git

diff --git a/time.c b/time.c
index c6a62878..505058f5 100644
--- a/time.c
+++ b/time.c
@@ -6,9 +6,10 @@
 static struct timeval genesis;
 static unsigned long ns_granularity;
 
-unsigned long utime_since(struct timeval *s, struct timeval *e)
+unsigned long long utime_since(struct timeval *s, struct timeval *e)
 {
 	long sec, usec;
+	unsigned long long ret;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -17,12 +18,18 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
 		usec += 1000000;
 	}
 
-	sec *= 1000000UL;
+	/*
+	 * time warp bug on some kernels?
+	 */
+	if (sec < 0 || (sec == 0 && usec < 0))
+		return 0;
 
-	return sec + usec;
+	ret = sec * 1000000ULL + usec;
+
+	return ret;
 }
 
-unsigned long utime_since_now(struct timeval *s)
+unsigned long long utime_since_now(struct timeval *s)
 {
 	struct timeval t;
 
@@ -32,7 +39,7 @@ unsigned long utime_since_now(struct timeval *s)
 
 unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
-	long sec, usec;
+	long sec, usec, ret;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -43,8 +50,15 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
 
 	sec *= 1000UL;
 	usec /= 1000UL;
+	ret = sec + usec;
+
+	/*
+	 * time warp bug on some kernels?
+	 */
+	if (ret < 0)
+		ret = 0;
 
-	return sec + usec;
+	return ret;
 }
 
 unsigned long mtime_since_now(struct timeval *s)