LU-9019 libcfs: remove the remaining cfs_time wrappers

[fs/lustre-release.git] / lustre / ptlrpc / service.c

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 89154e0..ab7aea1 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -482,7 +482,7 @@ static void ptlrpc_at_timer(unsigned long castmeharder)
        svcpt = (struct ptlrpc_service_part *)castmeharder;
 
        svcpt->scp_at_check = 1;
-       svcpt->scp_at_checktime = cfs_time_current();
+       svcpt->scp_at_checktime = ktime_get();
        wake_up(&svcpt->scp_waitq);
 }
 
@@ -1183,7 +1183,7 @@ static int ptlrpc_check_req(struct ptlrpc_request *req)
 static void ptlrpc_at_set_timer(struct ptlrpc_service_part *svcpt)
 {
        struct ptlrpc_at_array *array = &svcpt->scp_at_array;
-       __s32 next;
+       time64_t next;
 
        if (array->paa_count == 0) {
                del_timer(&svcpt->scp_at_timer);
@@ -1191,13 +1191,14 @@ static void ptlrpc_at_set_timer(struct ptlrpc_service_part *svcpt)
        }
 
        /* Set timer for closest deadline */
-       next = (__s32)(array->paa_deadline - ktime_get_real_seconds() -
-                      at_early_margin);
+       next = array->paa_deadline - ktime_get_real_seconds() -
+              at_early_margin;
        if (next <= 0) {
                ptlrpc_at_timer((unsigned long)svcpt);
        } else {
-               mod_timer(&svcpt->scp_at_timer, cfs_time_shift(next));
-               CDEBUG(D_INFO, "armed %s at %+ds\n",
+               mod_timer(&svcpt->scp_at_timer,
+                         jiffies + nsecs_to_jiffies(next * NSEC_PER_SEC));
+               CDEBUG(D_INFO, "armed %s at %+llds\n",
                       svcpt->scp_service->srv_name, next);
        }
 }
@@ -1449,16 +1450,16 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
         __u32  index, count;
        time64_t deadline;
        time64_t now = ktime_get_real_seconds();
-        cfs_duration_t delay;
-        int first, counter = 0;
-        ENTRY;
+       s64 delay;
+       int first, counter = 0;
 
+       ENTRY;
        spin_lock(&svcpt->scp_at_lock);
        if (svcpt->scp_at_check == 0) {
                spin_unlock(&svcpt->scp_at_lock);
                RETURN(0);
        }
-       delay = cfs_time_sub(cfs_time_current(), svcpt->scp_at_checktime);
+       delay = ktime_ms_delta(ktime_get(), svcpt->scp_at_checktime);
        svcpt->scp_at_check = 0;
 
        if (array->paa_count == 0) {
@@ -1522,7 +1523,7 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
                 LCONSOLE_WARN("%s: This server is not able to keep up with "
                              "request traffic (cpu-bound).\n",
                              svcpt->scp_service->srv_name);
-               CWARN("earlyQ=%d reqQ=%d recA=%d, svcEst=%d, delay=%ld(jiff)\n",
+               CWARN("earlyQ=%d reqQ=%d recA=%d, svcEst=%d, delay=%lld\n",
                      counter, svcpt->scp_nreqs_incoming,
                      svcpt->scp_nreqs_active,
                      at_get(&svcpt->scp_at_estimate), delay);