LU-4423 lnet: use 64-bit time for selftest

[fs/lustre-release.git] / lnet / selftest / timer.c

diff --git a/lnet/selftest/timer.c b/lnet/selftest/timer.c
index 404542f..ff016e9 100644 (file)
--- a/lnet/selftest/timer.c
+++ b/lnet/selftest/timer.c
@@ -74,13 +74,13 @@ stt_add_timer(stt_timer_t *timer)
        LASSERT(!stt_data.stt_shuttingdown);
        LASSERT(timer->stt_func != NULL);
        LASSERT(list_empty(&timer->stt_list));
        LASSERT(!stt_data.stt_shuttingdown);
        LASSERT(timer->stt_func != NULL);
        LASSERT(list_empty(&timer->stt_list));

-       LASSERT(cfs_time_after(timer->stt_expires, ktime_get_real_seconds()));
+       LASSERT(timer->stt_expires > ktime_get_real_seconds());

 
        /* a simple insertion sort */
        list_for_each_prev(pos, STTIMER_SLOT(timer->stt_expires)) {
                stt_timer_t *old = list_entry(pos, stt_timer_t, stt_list);
 
 
        /* a simple insertion sort */
        list_for_each_prev(pos, STTIMER_SLOT(timer->stt_expires)) {
                stt_timer_t *old = list_entry(pos, stt_timer_t, stt_list);
 

-               if (cfs_time_aftereq(timer->stt_expires, old->stt_expires))
+               if (timer->stt_expires >= old->stt_expires)

                        break;
        }
        list_add(&timer->stt_list, pos);
                        break;
        }
        list_add(&timer->stt_list, pos);


@@ -126,7 +126,7 @@ stt_expire_list(struct list_head *slot, time64_t now)
        while (!list_empty(slot)) {
                timer = list_entry(slot->next, stt_timer_t, stt_list);
 
        while (!list_empty(slot)) {
                timer = list_entry(slot->next, stt_timer_t, stt_list);
 

-               if (cfs_time_after(timer->stt_expires, now))
+               if (timer->stt_expires > now)

                        break;
 
                list_del_init(&timer->stt_list);
                        break;
 
                list_del_init(&timer->stt_list);