X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=time.c;h=6d79ecdca3036515f89aa0df5bd9a38b4b7085f8;hb=97e8cd444561ef03dd65c6c3c37c934796a4993f;hp=4fbc98bbc57f8b781d95c7a8362ce8b8ab348700;hpb=2bfe24bdd9ce313e5323d947952067b1475dd2cc;p=fio.git

diff --git a/time.c b/time.c
index 4fbc98bb..6d79ecdc 100644
--- a/time.c
+++ b/time.c
@@ -6,10 +6,11 @@
 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, ret;
-
+	long sec, usec;
+	unsigned long long ret;
+	
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
 	if (sec > 0 && usec < 0) {
@@ -17,19 +18,18 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
 		usec += 1000000;
 	}
 
-	sec *= 1000000UL;
-	ret = sec + usec;
-
 	/*
 	 * time warp bug on some kernels?
 	 */
-	if (ret < 0)
-		ret = 0;
-
+	if (sec < 0 || (sec == 0 && usec < 0))
+		return 0;
+	
+	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;