Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8891 llite: rcu-walk check should not depend on statahead
[fs/lustre-release.git]
/
lnet
/
selftest
/
conrpc.c
diff --git
a/lnet/selftest/conrpc.c
b/lnet/selftest/conrpc.c
index
014fe58
..
749714a
100644
(file)
--- 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);
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,
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)) ||
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;
}
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)
{
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);
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];
}
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)
{
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;
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 :
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);
}
rc = lstcon_rpc_prep(nd, SRPC_SERVICE_TEST, feats, npg, nob, crpc);