X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flinux-time.h;h=6a391e28a15b55a2078374888c0ead56398db2af;hb=800ffd4711863e1067a693f1283bccf4edddf2a2;hp=dc8438544ee6d9471799f1211a6d107b3d39c89f;hpb=b49f7b3ac64c06be014be44d5b468dce5a75a240;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h
index dc84385..6a391e2 100644
--- a/libcfs/include/libcfs/linux/linux-time.h
+++ b/libcfs/include/libcfs/linux/linux-time.h
@@ -154,6 +154,13 @@ static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2)
 }
 #endif /* !HAVE_KTIME_AFTER */
 
+#ifndef HAVE_KTIME_BEFORE
+static inline bool ktime_before(const ktime_t cmp1, const ktime_t cmp2)
+{
+	return cmp1.tv64 < cmp2.tv64;
+}
+#endif /* !HAVE_KTIME_BEFORE */
+
 #ifndef HAVE_KTIME_GET_TS64
 void ktime_get_ts64(struct timespec64 *ts);
 #endif /* HAVE_KTIME_GET_TS */
@@ -227,32 +234,14 @@ static inline time_t cfs_time_current_sec(void)
 
 static inline cfs_duration_t cfs_time_seconds(int seconds)
 {
-
 	return ((cfs_duration_t)seconds) * msecs_to_jiffies(MSEC_PER_SEC);
 }
 
 static inline time_t cfs_duration_sec(cfs_duration_t d)
 {
-
 	return d / msecs_to_jiffies(MSEC_PER_SEC);
 }
 
-static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s)
-{
-#if (BITS_PER_LONG == 32)
-	__u64 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 / 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
-}
-
 #define cfs_time_current_64 get_jiffies_64
 
 static inline __u64 cfs_time_add_64(__u64 t, __u64 d)
@@ -279,17 +268,6 @@ static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2)
 /*
  * One jiffy
  */
-#define CFS_TIME_T              "%lu"
 #define CFS_DURATION_T          "%ld"
 
-
 #endif /* __LIBCFS_LINUX_LINUX_TIME_H__ */
-/*
- * Local variables:
- * c-indentation-style: "K&R"
- * c-basic-offset: 8
- * tab-width: 8
- * fill-column: 80
- * scroll-step: 1
- * End:
- */