LU-9859 libcfs: remove wi_data from cfs_workitem

[fs/lustre-release.git] / lnet / selftest / selftest.h

diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index c6514b5..ea1ee06 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) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,7 +42,7 @@
 #include <lnet/api.h>
 #include <lnet/lib-lnet.h>
 #include <lnet/lib-types.h>
-#include <lnet/lnetst.h>
+#include <uapi/linux/lnet/lnetst.h>
 
 #include "rpc.h"
 #include "timer.h"
@@ -333,7 +333,7 @@ struct sfw_session {
        atomic_t                sn_refcount;
        atomic_t                sn_brw_errors;
        atomic_t                sn_ping_errors;
-       cfs_time_t              sn_started;
+       ktime_t                 sn_started;
 };
 
 #define sfw_sid_equal(sid0, sid1)     ((sid0).ses_nid == (sid1).ses_nid && \
@@ -467,13 +467,13 @@ swi_wi_action(struct cfs_workitem *wi)
 }
 
 static inline void
-swi_init_workitem(struct swi_workitem *swi, void *data,
+swi_init_workitem(struct swi_workitem *swi,
                  swi_action_t action, struct cfs_wi_sched *sched)
 {
        swi->swi_sched  = sched;
        swi->swi_action = action;
        swi->swi_state  = SWI_STATE_NEWBORN;
-       cfs_wi_init(&swi->swi_workitem, data, swi_wi_action);
+       cfs_wi_init(&swi->swi_workitem, swi_wi_action);
 }
 
 static inline void
@@ -527,7 +527,7 @@ srpc_init_client_rpc(struct srpc_client_rpc *rpc, struct lnet_process_id peer,
                                crpc_bulk.bk_iovs[nbulkiov]));
 
        INIT_LIST_HEAD(&rpc->crpc_list);
-       swi_init_workitem(&rpc->crpc_wi, rpc, srpc_send_rpc,
+       swi_init_workitem(&rpc->crpc_wi, srpc_send_rpc,
                          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 */