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-7734 lnet: fix routing selection
[fs/lustre-release.git]
/
lnet
/
selftest
/
selftest.h
diff --git
a/lnet/selftest/selftest.h
b/lnet/selftest/selftest.h
index
c5961b1
..
9fecaad
100644
(file)
--- a/
lnet/selftest/selftest.h
+++ b/
lnet/selftest/selftest.h
@@
-23,7
+23,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-274,7
+274,7
@@
struct srpc_service_cd {
/** error code for scd_buf_wi */
int scd_buf_err;
/** timestamp for scd_buf_err */
/** error code for scd_buf_wi */
int scd_buf_err;
/** timestamp for scd_buf_err */
-
unsigned long
scd_buf_err_stamp;
+
time64_t
scd_buf_err_stamp;
/** total # request buffers */
int scd_buf_total;
/** # posted request buffers */
/** total # request buffers */
int scd_buf_total;
/** # posted request buffers */
@@
-387,7
+387,7
@@
typedef struct sfw_test_instance {
/* XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at
* the end of pages are not used */
#define SFW_MAX_CONCUR LST_MAX_CONCUR
/* XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at
* the end of pages are not used */
#define SFW_MAX_CONCUR LST_MAX_CONCUR
-#define SFW_ID_PER_PAGE (PAGE_SIZE / sizeof(
lnet_process_id_packed_t
))
+#define SFW_ID_PER_PAGE (PAGE_SIZE / sizeof(
struct lnet_process_id_packed
))
#define SFW_MAX_NDESTS (LNET_MAX_IOV * SFW_ID_PER_PAGE)
#define sfw_id_pages(n) (((n) + SFW_ID_PER_PAGE - 1) / SFW_ID_PER_PAGE)
#define SFW_MAX_NDESTS (LNET_MAX_IOV * SFW_ID_PER_PAGE)
#define sfw_id_pages(n) (((n) + SFW_ID_PER_PAGE - 1) / SFW_ID_PER_PAGE)
@@
-524,7
+524,7
@@
srpc_init_client_rpc(srpc_client_rpc_t *rpc, lnet_process_id_t peer,
INIT_LIST_HEAD(&rpc->crpc_list);
swi_init_workitem(&rpc->crpc_wi, rpc, srpc_send_rpc,
INIT_LIST_HEAD(&rpc->crpc_list);
swi_init_workitem(&rpc->crpc_wi, rpc, srpc_send_rpc,
- lst_sched_test[lnet_cpt_of_nid(peer.nid)]);
+ lst_sched_test[lnet_cpt_of_nid(peer.nid
, NULL
)]);
spin_lock_init(&rpc->crpc_lock);
atomic_set(&rpc->crpc_refcount, 1); /* 1 ref for caller */
spin_lock_init(&rpc->crpc_lock);
atomic_set(&rpc->crpc_refcount, 1); /* 1 ref for caller */