These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lnet / selftest / ping_test.c

diff --git a/kernel/drivers/staging/lustre/lnet/selftest/ping_test.c b/kernel/drivers/staging/lustre/lnet/selftest/ping_test.c
index 644069a..d426536 100644 (file)
--- a/kernel/drivers/staging/lustre/lnet/selftest/ping_test.c
+++ b/kernel/drivers/staging/lustre/lnet/selftest/ping_test.c
@@ -73,7 +73,7 @@ static void
 ping_client_fini(sfw_test_instance_t *tsi)
 {
        sfw_session_t *sn = tsi->tsi_batch->bat_session;
-       int         errors;
+       int errors;
 
        LASSERT(sn != NULL);
        LASSERT(tsi->tsi_is_client);
@@ -89,11 +89,11 @@ static int
 ping_client_prep_rpc(sfw_test_unit_t *tsu,
                     lnet_process_id_t dest, srpc_client_rpc_t **rpc)
 {
-       srpc_ping_reqst_t   *req;
+       srpc_ping_reqst_t *req;
        sfw_test_instance_t *tsi = tsu->tsu_instance;
-       sfw_session_t       *sn  = tsi->tsi_batch->bat_session;
-       struct timeval       tv;
-       int                  rc;
+       sfw_session_t *sn = tsi->tsi_batch->bat_session;
+       struct timespec64 ts;
+       int rc;
 
        LASSERT(sn != NULL);
        LASSERT((sn->sn_features & ~LST_FEATS_MASK) == 0);
@@ -110,9 +110,9 @@ ping_client_prep_rpc(sfw_test_unit_t *tsu,
        req->pnr_seq = lst_ping_data.pnd_counter++;
        spin_unlock(&lst_ping_data.pnd_lock);
 
-       cfs_fs_timeval(&tv);
-       req->pnr_time_sec  = tv.tv_sec;
-       req->pnr_time_usec = tv.tv_usec;
+       ktime_get_real_ts64(&ts);
+       req->pnr_time_sec  = ts.tv_sec;
+       req->pnr_time_usec = ts.tv_nsec / NSEC_PER_USEC;
 
        return rc;
 }
@@ -121,10 +121,10 @@ static void
 ping_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 {
        sfw_test_instance_t *tsi = tsu->tsu_instance;
-       sfw_session_t       *sn = tsi->tsi_batch->bat_session;
-       srpc_ping_reqst_t   *reqst = &rpc->crpc_reqstmsg.msg_body.ping_reqst;
-       srpc_ping_reply_t   *reply = &rpc->crpc_replymsg.msg_body.ping_reply;
-       struct timeval       tv;
+       sfw_session_t *sn = tsi->tsi_batch->bat_session;
+       srpc_ping_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.ping_reqst;
+       srpc_ping_reply_t *reply = &rpc->crpc_replymsg.msg_body.ping_reply;
+       struct timespec64 ts;
 
        LASSERT(sn != NULL);
 
@@ -161,19 +161,19 @@ ping_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
                return;
        }
 
-       cfs_fs_timeval(&tv);
+       ktime_get_real_ts64(&ts);
        CDEBUG(D_NET, "%d reply in %u usec\n", reply->pnr_seq,
-               (unsigned)((tv.tv_sec - (unsigned)reqst->pnr_time_sec) * 1000000
-                          + (tv.tv_usec - reqst->pnr_time_usec)));
+              (unsigned)((ts.tv_sec - reqst->pnr_time_sec) * 1000000 +
+                         (ts.tv_nsec / NSEC_PER_USEC - reqst->pnr_time_usec)));
        return;
 }
 
 static int
 ping_server_handle(struct srpc_server_rpc *rpc)
 {
-       struct srpc_service     *sv  = rpc->srpc_scd->scd_svc;
-       srpc_msg_t      *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
-       srpc_msg_t        *replymsg = &rpc->srpc_replymsg;
+       struct srpc_service *sv  = rpc->srpc_scd->scd_svc;
+       srpc_msg_t *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
+       srpc_msg_t *replymsg = &rpc->srpc_replymsg;
        srpc_ping_reqst_t *req = &reqstmsg->msg_body.ping_reqst;
        srpc_ping_reply_t *rep = &rpc->srpc_replymsg.msg_body.ping_reply;