X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fconrpc.c;h=749714af20c0e39396d7c410022e933b21b640d0;hb=d054c3d4c173a41ca7c74ebe361d6de2e7aa507a;hp=014fe5803a22c681ddf7381f0478f76e26cd92d8;hpb=31aa2bcc2bf65d79fbdc551870c0999596bb2eeb;p=fs%2Flustre-release.git

diff --git a/lnet/selftest/conrpc.c b/lnet/selftest/conrpc.c
index 014fe58..749714a 100644
--- a/lnet/selftest/conrpc.c
+++ b/lnet/selftest/conrpc.c
@@ -503,10 +503,10 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
 
                 dur = (cfs_duration_t)cfs_time_sub(crpc->crp_stamp,
                       (cfs_time_t)console_session.ses_id.ses_stamp);
-                cfs_duration_usec(dur, &tv);
+		jiffies_to_timeval(dur, &tv);
 
 		if (copy_to_user(&ent->rpe_peer,
-				 &nd->nd_id, sizeof(lnet_process_id_t)) ||
+				 &nd->nd_id, sizeof(struct lnet_process_id)) ||
 		    copy_to_user(&ent->rpe_stamp, &tv, sizeof(tv)) ||
 		    copy_to_user(&ent->rpe_state,
 				 &nd->nd_state, sizeof(nd->nd_state)) ||
@@ -699,17 +699,17 @@ lstcon_statrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)
         return 0;
 }
 
-static lnet_process_id_packed_t *
+static struct lnet_process_id_packed *
 lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov)
 {
-        lnet_process_id_packed_t *pid;
+	struct lnet_process_id_packed *pid;
         int                       i;
 
         i = idx / SFW_ID_PER_PAGE;
 
         LASSERT (i < nkiov);
 
-	pid = (lnet_process_id_packed_t *)page_address(kiov[i].kiov_page);
+	pid = (struct lnet_process_id_packed *)page_address(kiov[i].kiov_page);
 
         return &pid[idx % SFW_ID_PER_PAGE];
 }
@@ -718,7 +718,7 @@ static int
 lstcon_dstnodes_prep(lstcon_group_t *grp, int idx,
                      int dist, int span, int nkiov, lnet_kiov_t *kiov)
 {
-        lnet_process_id_packed_t *pid;
+	struct lnet_process_id_packed *pid;
         lstcon_ndlink_t          *ndl;
         lstcon_node_t            *nd;
         int                       start;
@@ -823,7 +823,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
 		npg = sfw_id_pages(test->tes_span);
 		nob = (feats & LST_FEAT_BULK_LEN) == 0 ?
 		      npg * PAGE_SIZE :
-		      sizeof(lnet_process_id_packed_t) * test->tes_span;
+		      sizeof(struct lnet_process_id_packed) * test->tes_span;
 	}
 
 	rc = lstcon_rpc_prep(nd, SRPC_SERVICE_TEST, feats, npg, nob, crpc);