LU-9019 libcfs: migrate watchdog to 64 bit time

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-prim.c

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index bd3979f..1d07692 100644 (file)
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -42,51 +42,59 @@
 #include <asm/kgdb.h>
 #endif
 
-void cfs_init_timer(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_TS64
+void ktime_get_ts64(struct timespec64 *ts)
 {
-       init_timer(t);
-}
-EXPORT_SYMBOL(cfs_init_timer);
+       struct timespec now;
 
-void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg)
-{
-       init_timer(t);
-       t->function = func;
-       t->data = (unsigned long)arg;
+       ktime_get_ts(&now);
+       *ts = timespec_to_timespec64(now);
 }
-EXPORT_SYMBOL(cfs_timer_init);
+EXPORT_SYMBOL(ktime_get_ts64);
+#endif /* HAVE_KTIME_GET_TS64 */
 
-void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline)
+#ifndef HAVE_KTIME_GET_REAL_TS64
+void ktime_get_real_ts64(struct timespec64 *ts)
 {
-       mod_timer(t, deadline);
-}
-EXPORT_SYMBOL(cfs_timer_arm);
+       struct timespec now;
 
-void cfs_timer_disarm(struct timer_list *t)
-{
-       del_timer(t);
+       getnstimeofday(&now);
+       *ts = timespec_to_timespec64(now);
 }
-EXPORT_SYMBOL(cfs_timer_disarm);
+EXPORT_SYMBOL(ktime_get_real_ts64);
+#endif /* HAVE_KTIME_GET_REAL_TS64 */
 
-int  cfs_timer_is_armed(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_REAL_SECONDS
+/*
+ * Get the seconds portion of CLOCK_REALTIME (wall clock).
+ * This is the clock that can be altered by NTP and is
+ * independent of a reboot.
+ */
+time64_t ktime_get_real_seconds(void)
 {
-       return timer_pending(t);
+       return (time64_t)get_seconds();
 }
-EXPORT_SYMBOL(cfs_timer_is_armed);
+EXPORT_SYMBOL(ktime_get_real_seconds);
+#endif /* HAVE_KTIME_GET_REAL_SECONDS */
 
-cfs_time_t cfs_timer_deadline(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_SECONDS
+/*
+ * Get the seconds portion of CLOCK_MONOTONIC
+ * This clock is immutable and is reset across
+ * reboots. For older platforms this is a
+ * wrapper around get_seconds which is valid
+ * until 2038. By that time this will be gone
+ * one would hope.
+ */
+time64_t ktime_get_seconds(void)
 {
-       return t->expires;
-}
-EXPORT_SYMBOL(cfs_timer_deadline);
+       struct timespec64 now;
 
-#ifndef HAVE_KTIME_GET_REAL_TS64
-void ktime_get_real_ts64(struct timespec64 *ts)
-{
-       *ts = timespec_to_timespec64(CURRENT_TIME);
+       ktime_get_ts64(&now);
+       return now.tv_sec;
 }
-EXPORT_SYMBOL(ktime_get_real_ts64);
-#endif /* HAVE_KTIME_GET_REAL_TS64 */
+EXPORT_SYMBOL(ktime_get_seconds);
+#endif /* HAVE_KTIME_GET_SECONDS */
 
 sigset_t
 cfs_block_allsigs(void)