Merge branch 'master' into gfio

[fio.git] / time.c

diff --git a/time.c b/time.c
index ef05094e733915fc1c2c59a0ef8bd17ac8d9613b..4af84bc7cc5b6a2e1f0be57f284e3e6c3d57f2c8 100644 (file)
--- a/time.c
+++ b/time.c
@@ -48,16 +48,13 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
                usec += 1000000;
        }
 
+       if (sec < 0 || (sec == 0 && usec < 0))
+               return 0;
+
        sec *= 1000UL;
        usec /= 1000UL;
        ret = sec + usec;
 
-       /*
-        * time warp bug on some kernels?
-        */
-       if (ret < 0)
-               ret = 0;
-
        return ret;
 }