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
/
brw_test.c
diff --git
a/lnet/selftest/brw_test.c
b/lnet/selftest/brw_test.c
index
9fa6beb
..
512dbb5
100644
(file)
--- a/
lnet/selftest/brw_test.c
+++ b/
lnet/selftest/brw_test.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,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
5
, 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/
@@
-124,7
+120,7
@@
brw_client_init (sfw_test_instance_t *tsi)
return -EINVAL;
list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) {
return -EINVAL;
list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) {
- bulk = srpc_alloc_bulk(lnet_cpt_of_nid(tsu->tsu_dest.nid),
+ bulk = srpc_alloc_bulk(lnet_cpt_of_nid(tsu->tsu_dest.nid
, NULL
),
off, npg, len, opc == LST_BRW_READ);
if (bulk == NULL) {
brw_client_fini(tsi);
off, npg, len, opc == LST_BRW_READ);
if (bulk == NULL) {
brw_client_fini(tsi);
@@
-143,13
+139,14
@@
brw_client_init (sfw_test_instance_t *tsi)
int brw_inject_one_error(void)
{
int brw_inject_one_error(void)
{
- struct time
val tv
;
+ struct time
spec64 ts
;
if (brw_inject_errors <= 0) return 0;
if (brw_inject_errors <= 0) return 0;
-
do_gettimeofday(&tv
);
+
ktime_get_ts64(&ts
);
- if ((tv.tv_usec & 1) == 0) return 0;
+ if (((ts.tv_nsec / NSEC_PER_USEC) & 1) == 0)
+ return 0;
return brw_inject_errors--;
}
return brw_inject_errors--;
}
@@
-272,7
+269,7
@@
brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
static int
brw_client_prep_rpc(sfw_test_unit_t *tsu,
static int
brw_client_prep_rpc(sfw_test_unit_t *tsu,
-
lnet_process_id_t
dest, srpc_client_rpc_t **rpcpp)
+
struct lnet_process_id
dest, srpc_client_rpc_t **rpcpp)
{
srpc_bulk_t *bulk = tsu->tsu_private;
sfw_test_instance_t *tsi = tsu->tsu_instance;
{
srpc_bulk_t *bulk = tsu->tsu_private;
sfw_test_instance_t *tsi = tsu->tsu_instance;