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

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

diff --git a/kernel/drivers/staging/lustre/lnet/selftest/brw_test.c b/kernel/drivers/staging/lustre/lnet/selftest/brw_test.c
index 658f458..0605c65 100644 (file)
--- a/kernel/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/kernel/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -91,7 +91,7 @@ brw_client_init(sfw_test_instance_t *tsi)
                len   = npg * PAGE_CACHE_SIZE;
 
        } else {
-               test_bulk_req_v1_t  *breq = &tsi->tsi_u.bulk_v1;
+               test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
 
                /* I should never get this step if it's unknown feature
                 * because make_session will reject unknown feature */
@@ -134,14 +134,14 @@ brw_client_init(sfw_test_instance_t *tsi)
 static int
 brw_inject_one_error(void)
 {
-       struct timeval tv;
+       struct timespec64 ts;
 
        if (brw_inject_errors <= 0)
                return 0;
 
-       do_gettimeofday(&tv);
+       ktime_get_ts64(&ts);
 
-       if ((tv.tv_usec & 1) == 0)
+       if (((ts.tv_nsec / NSEC_PER_USEC) & 1) == 0)
                return 0;
 
        return brw_inject_errors--;
@@ -223,7 +223,7 @@ bad_data:
 static void
 brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 {
-       int      i;
+       int i;
        struct page *pg;
 
        for (i = 0; i < bk->bk_niov; i++) {
@@ -235,7 +235,7 @@ brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 static int
 brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 {
-       int      i;
+       int i;
        struct page *pg;
 
        for (i = 0; i < bk->bk_niov; i++) {
@@ -254,16 +254,16 @@ static int
 brw_client_prep_rpc(sfw_test_unit_t *tsu,
                     lnet_process_id_t dest, srpc_client_rpc_t **rpcpp)
 {
-       srpc_bulk_t      *bulk = tsu->tsu_private;
+       srpc_bulk_t *bulk = tsu->tsu_private;
        sfw_test_instance_t *tsi = tsu->tsu_instance;
-       sfw_session_t       *sn = tsi->tsi_batch->bat_session;
-       srpc_client_rpc_t   *rpc;
-       srpc_brw_reqst_t    *req;
-       int                  flags;
-       int                  npg;
-       int                  len;
-       int                  opc;
-       int                  rc;
+       sfw_session_t *sn = tsi->tsi_batch->bat_session;
+       srpc_client_rpc_t *rpc;
+       srpc_brw_reqst_t *req;
+       int flags;
+       int npg;
+       int len;
+       int opc;
+       int rc;
 
        LASSERT(sn != NULL);
        LASSERT(bulk != NULL);
@@ -277,7 +277,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
                len   = npg * PAGE_CACHE_SIZE;
 
        } else {
-               test_bulk_req_v1_t  *breq = &tsi->tsi_u.bulk_v1;
+               test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
 
                /* I should never get this step if it's unknown feature
                 * because make_session will reject unknown feature */
@@ -311,12 +311,12 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
 static void
 brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 {
-       __u64           magic = BRW_MAGIC;
+       __u64 magic = BRW_MAGIC;
        sfw_test_instance_t *tsi = tsu->tsu_instance;
-       sfw_session_t       *sn = tsi->tsi_batch->bat_session;
-       srpc_msg_t        *msg = &rpc->crpc_replymsg;
-       srpc_brw_reply_t    *reply = &msg->msg_body.brw_reply;
-       srpc_brw_reqst_t    *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
+       sfw_session_t *sn = tsi->tsi_batch->bat_session;
+       srpc_msg_t *msg = &rpc->crpc_replymsg;
+       srpc_brw_reply_t *reply = &msg->msg_body.brw_reply;
+       srpc_brw_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
 
        LASSERT(sn != NULL);
 
@@ -380,10 +380,10 @@ brw_server_rpc_done(srpc_server_rpc_t *rpc)
 static int
 brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
 {
-       __u64        magic = BRW_MAGIC;
+       __u64 magic = BRW_MAGIC;
        srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
        srpc_brw_reqst_t *reqst;
-       srpc_msg_t       *reqstmsg;
+       srpc_msg_t *reqstmsg;
 
        LASSERT(rpc->srpc_bulk != NULL);
        LASSERT(rpc->srpc_reqstbuf != NULL);
@@ -416,13 +416,13 @@ brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
 static int
 brw_server_handle(struct srpc_server_rpc *rpc)
 {
-       struct srpc_service     *sv = rpc->srpc_scd->scd_svc;
-       srpc_msg_t       *replymsg = &rpc->srpc_replymsg;
-       srpc_msg_t       *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
+       struct srpc_service *sv = rpc->srpc_scd->scd_svc;
+       srpc_msg_t *replymsg = &rpc->srpc_replymsg;
+       srpc_msg_t *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
        srpc_brw_reply_t *reply = &replymsg->msg_body.brw_reply;
        srpc_brw_reqst_t *reqst = &reqstmsg->msg_body.brw_reqst;
-       int               npg;
-       int            rc;
+       int npg;
+       int rc;
 
        LASSERT(sv->sv_id == SRPC_SERVICE_BRW);
 
@@ -490,17 +490,17 @@ brw_server_handle(struct srpc_server_rpc *rpc)
 sfw_test_client_ops_t brw_test_client;
 void brw_init_test_client(void)
 {
-       brw_test_client.tso_init       = brw_client_init;
-       brw_test_client.tso_fini       = brw_client_fini;
-       brw_test_client.tso_prep_rpc   = brw_client_prep_rpc;
-       brw_test_client.tso_done_rpc   = brw_client_done_rpc;
+       brw_test_client.tso_init     = brw_client_init;
+       brw_test_client.tso_fini     = brw_client_fini;
+       brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
+       brw_test_client.tso_done_rpc = brw_client_done_rpc;
 };
 
 srpc_service_t brw_test_service;
 void brw_init_test_service(void)
 {
 
-       brw_test_service.sv_id   = SRPC_SERVICE_BRW;
+       brw_test_service.sv_id         = SRPC_SERVICE_BRW;
        brw_test_service.sv_name       = "brw_test";
        brw_test_service.sv_handler    = brw_server_handle;
        brw_test_service.sv_bulk_ready = brw_bulk_ready;