LU-4423 selftest: use jiffies_to_*() instead of cfs_duration_usec

[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 6d1b085..dc84385 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-time.h
+++ b/libcfs/include/libcfs/linux/linux-time.h
@@ -111,6 +111,11 @@ static inline struct timespec64 timespec_to_timespec64(const struct timespec ts)
        return ts;
 }
 
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts)
+{
+       return ts;
+}
+
 #else
 struct timespec64 {
        time64_t        tv_sec;         /* seconds */
@@ -125,6 +130,15 @@ static inline struct timespec64 timespec_to_timespec64(const struct timespec ts)
        ret.tv_nsec = ts.tv_nsec;
        return ret;
 }
+
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)
+{
+       struct timespec ret;
+
+       ret.tv_sec = (time_t)ts64.tv_sec;
+       ret.tv_nsec = ts64.tv_nsec;
+       return ret;
+}
 #endif /* __BITS_PER_LONG != 64 */
 
 #endif /* HAVE_TIMESPEC64 */
@@ -172,6 +186,25 @@ static inline struct timespec64 ktime_to_timespec64(ktime_t kt)
 }
 #endif /* HAVE_KTIME_TO_TIMESPEC64 */
 
+#ifndef HAVE_TIMESPEC64_SUB
+static inline struct timespec64
+timespec64_sub(struct timespec64 later, struct timespec64 earlier)
+{
+       struct timespec diff;
+
+       diff = timespec_sub(timespec64_to_timespec(later),
+                           timespec64_to_timespec(earlier));
+       return timespec_to_timespec64(diff);
+}
+#endif
+
+#ifndef HAVE_TIMESPEC64_TO_KTIME
+static inline ktime_t timespec64_to_ktime(struct timespec64 ts)
+{
+       return ktime_set(ts.tv_sec, ts.tv_nsec);
+}
+#endif
+
 static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
 {
         return time_before(t1, t2);
@@ -204,31 +237,6 @@ static inline time_t cfs_duration_sec(cfs_duration_t d)
        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)
-       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 / 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)