LU-5443 libcfs: replace direct HZ access with kernel APIs

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-time.h

diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h
index 987dfc1..af0c6c9 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-time.h
+++ b/libcfs/include/libcfs/linux/linux-time.h
@@ -125,7 +125,7 @@ static inline void cfs_fs_time_nsec(cfs_fs_time_t *t, struct timespec *s)
  */
 static inline unsigned long long __cfs_fs_time_flat(cfs_fs_time_t *t)
 {
-        return (unsigned long long)t->tv_sec * ONE_BILLION + t->tv_nsec;
+       return (unsigned long long)t->tv_sec * NSEC_PER_SEC + t->tv_nsec;
 }
 
 
@@ -177,60 +177,56 @@ static inline int cfs_fs_time_beforeq(cfs_fs_time_t *t1, cfs_fs_time_t *t2)
         return __cfs_fs_time_flat(t1) <= __cfs_fs_time_flat(t2);
 }
 
-#if 0
-static inline cfs_duration_t cfs_duration_build(int64_t nano)
-{
-#if (BITS_PER_LONG == 32)
-        /* We cannot use do_div(t, ONE_BILLION), do_div can only process
-         * 64 bits n and 32 bits base */
-        int64_t  t = nano * HZ;
-        do_div(t, 1000);
-        do_div(t, 1000000);
-        return (cfs_duration_t)t;
-#else
-        return (nano * HZ / ONE_BILLION);
-#endif
-}
-#endif
-
 static inline cfs_duration_t cfs_time_seconds(int seconds)
 {
-        return ((cfs_duration_t)seconds) * HZ;
+
+       return ((cfs_duration_t)seconds) * msecs_to_jiffies(MSEC_PER_SEC);
 }
 
 static inline time_t cfs_duration_sec(cfs_duration_t d)
 {
-        return d / HZ;
+
+       return d / msecs_to_jiffies(MSEC_PER_SEC);
 }
 
 static inline void cfs_duration_usec(cfs_duration_t d, struct timeval *s)
 {
-#if (BITS_PER_LONG == 32) && (HZ > 4096)
-        __u64 t;
-
-        s->tv_sec = d / HZ;
-        t = (d - (cfs_duration_t)s->tv_sec * HZ) * ONE_MILLION;
-        do_div(t, HZ);
-        s->tv_usec = t;
+#if (BITS_PER_LONG == 32)
+       if (msecs_to_jiffies(MSEC_PER_SEC) > 4096) {
+               __u64 t;
+
+               s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
+               t = (d - (cfs_duration_t)s->tv_sec *
+                    msecs_to_jiffies(MSEC_PER_SEC)) * USEC_PER_SEC;
+               do_div(t, msecs_to_jiffies(MSEC_PER_SEC));
+               s->tv_usec = t;
+       } else {
+               s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
+               s->tv_usec = ((d - (cfs_duration_t)s->tv_sec *
+                              msecs_to_jiffies(MSEC_PER_SEC)) *
+                              USEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC);
+       }
 #else
-        s->tv_sec = d / HZ;
-        s->tv_usec = ((d - (cfs_duration_t)s->tv_sec * HZ) * \
-                ONE_MILLION) / HZ;
+       s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
+       s->tv_usec = ((d - (cfs_duration_t)s->tv_sec *
+                      msecs_to_jiffies(MSEC_PER_SEC)) *
+                      USEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC);
 #endif
 }
 
 static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s)
 {
 #if (BITS_PER_LONG == 32)
-        __u64 t;
+       __u64 t;
 
-        s->tv_sec = d / HZ;
-        t = (d - s->tv_sec * HZ) * ONE_BILLION;
-        do_div(t, HZ);
-        s->tv_nsec = t;
+       s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
+       t = (d - s->tv_sec * msecs_to_jiffies(MSEC_PER_SEC)) * NSEC_PER_SEC;
+       do_div(t, msecs_to_jiffies(MSEC_PER_SEC));
+       s->tv_nsec = t;
 #else
-        s->tv_sec = d / HZ;
-        s->tv_nsec = ((d - s->tv_sec * HZ) * ONE_BILLION) / HZ;
+       s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
+       s->tv_nsec = ((d - s->tv_sec * msecs_to_jiffies(MSEC_PER_SEC)) *
+                     NSEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC);
 #endif
 }