LU-6142 lnet: remove most of typedefs from LNet headers

[fs/lustre-release.git] / lnet / selftest / rpc.c

diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index 4079698..80b6df5 100644 (file)
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.c
@@ -53,7 +53,7 @@ typedef enum {
 static struct smoketest_rpc {
        spinlock_t       rpc_glock;     /* global lock */
        srpc_service_t  *rpc_services[SRPC_SERVICE_MAX_ID + 1];
-       lnet_handle_eq_t rpc_lnet_eq;   /* _the_ LNet event queue */
+       struct lnet_handle_eq   rpc_lnet_eq;    /* _the_ LNet event queue */
        srpc_state_t     rpc_state;
        struct srpc_counters     rpc_counters;
        __u64            rpc_matchbits; /* matchbits counter */
@@ -184,7 +184,7 @@ srpc_init_server_rpc(struct srpc_server_rpc *rpc,
        rpc->srpc_reqstbuf = buffer;
        rpc->srpc_peer     = buffer->buf_peer;
        rpc->srpc_self     = buffer->buf_self;
-       LNetInvalidateHandle(&rpc->srpc_replymdh);
+       LNetInvalidateMDHandle(&rpc->srpc_replymdh);
 }
 
 static void
@@ -351,12 +351,12 @@ srpc_remove_service (srpc_service_t *sv)
 
 static int
 srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf,
-                      int len, int options, lnet_process_id_t peer,
-                      lnet_handle_md_t *mdh, srpc_event_t *ev)
+                      int len, int options, struct lnet_process_id peer,
+                      struct lnet_handle_md *mdh, srpc_event_t *ev)
 {
        int              rc;
-       lnet_md_t        md;
-       lnet_handle_me_t meh;
+       struct lnet_md   md;
+       struct lnet_handle_me meh;
 
        rc = LNetMEAttach(portal, peer, matchbits, 0, LNET_UNLINK,
                          local ? LNET_INS_LOCAL : LNET_INS_AFTER, &meh);
@@ -391,11 +391,11 @@ srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf,
 
 static int
 srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
-                      int options, lnet_process_id_t peer, lnet_nid_t self,
-                      lnet_handle_md_t *mdh, srpc_event_t *ev)
+                     int options, struct lnet_process_id peer, lnet_nid_t self,
+                     struct lnet_handle_md *mdh, srpc_event_t *ev)
 {
-        int       rc;
-        lnet_md_t md;
+       int rc;
+       struct lnet_md md;
 
         md.user_ptr  = ev;
         md.start     = buf;
@@ -443,9 +443,9 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
 
 static int
 srpc_post_passive_rqtbuf(int service, int local, void *buf, int len,
-                        lnet_handle_md_t *mdh, srpc_event_t *ev)
+                        struct lnet_handle_md *mdh, srpc_event_t *ev)
 {
-       lnet_process_id_t any = {0};
+       struct lnet_process_id any = {0};
 
        any.nid = LNET_NID_ANY;
        any.pid = LNET_PID_ANY;
@@ -463,7 +463,7 @@ __must_hold(&scd->scd_lock)
        struct srpc_msg         *msg = &buf->buf_msg;
        int                     rc;
 
-       LNetInvalidateHandle(&buf->buf_mdh);
+       LNetInvalidateMDHandle(&buf->buf_mdh);
        list_add(&buf->buf_list, &scd->scd_buf_posted);
        scd->scd_buf_nposted++;
        spin_unlock(&scd->scd_lock);
@@ -1287,10 +1287,10 @@ abort:
 }
 
 srpc_client_rpc_t *
-srpc_create_client_rpc (lnet_process_id_t peer, int service,
-                        int nbulkiov, int bulklen,
-                        void (*rpc_done)(srpc_client_rpc_t *),
-                        void (*rpc_fini)(srpc_client_rpc_t *), void *priv)
+srpc_create_client_rpc(struct lnet_process_id peer, int service,
+                      int nbulkiov, int bulklen,
+                      void (*rpc_done)(srpc_client_rpc_t *),
+                      void (*rpc_fini)(srpc_client_rpc_t *), void *priv)
 {
         srpc_client_rpc_t *rpc;
 
@@ -1387,7 +1387,7 @@ srpc_send_reply(struct srpc_server_rpc *rpc)
 
 /* when in kernel always called with LNET_LOCK() held, and in thread context */
 static void
-srpc_lnet_ev_handler(lnet_event_t *ev)
+srpc_lnet_ev_handler(struct lnet_event *ev)
 {
        struct srpc_service_cd  *scd;
        srpc_event_t      *rpcev = ev->md.user_ptr;
@@ -1599,7 +1599,7 @@ srpc_startup (void)
 
         srpc_data.rpc_state = SRPC_STATE_NI_INIT;
 
-        LNetInvalidateHandle(&srpc_data.rpc_lnet_eq);
+       LNetInvalidateEQHandle(&srpc_data.rpc_lnet_eq);
        rc = LNetEQAlloc(0, srpc_lnet_ev_handler, &srpc_data.rpc_lnet_eq);
         if (rc != 0) {
                 CERROR("LNetEQAlloc() has failed: %d\n", rc);