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

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_cb.c

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 3901be7..da2c084 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -40,19 +40,19 @@
 
 static void kiblnd_peer_alive(kib_peer_ni_t *peer_ni);
 static void kiblnd_peer_connect_failed(kib_peer_ni_t *peer_ni, int active, int error);
-static void kiblnd_init_tx_msg(lnet_ni_t *ni, kib_tx_t *tx,
+static void kiblnd_init_tx_msg(struct lnet_ni *ni, kib_tx_t *tx,
                               int type, int body_nob);
 static int kiblnd_init_rdma(kib_conn_t *conn, kib_tx_t *tx, int type,
                            int resid, kib_rdma_desc_t *dstrd, __u64 dstcookie);
 static void kiblnd_queue_tx_locked(kib_tx_t *tx, kib_conn_t *conn);
 static void kiblnd_queue_tx(kib_tx_t *tx, kib_conn_t *conn);
-static void kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx);
+static void kiblnd_unmap_tx(struct lnet_ni *ni, kib_tx_t *tx);
 static void kiblnd_check_sends_locked(kib_conn_t *conn);
 
 void
-kiblnd_tx_done (lnet_ni_t *ni, kib_tx_t *tx)
+kiblnd_tx_done(struct lnet_ni *ni, kib_tx_t *tx)
 {
-       lnet_msg_t *lntmsg[2];
+       struct lnet_msg *lntmsg[2];
        kib_net_t  *net = ni->ni_data;
        int         rc;
        int         i;
@@ -93,7 +93,7 @@ kiblnd_tx_done (lnet_ni_t *ni, kib_tx_t *tx)
 }
 
 void
-kiblnd_txlist_done(lnet_ni_t *ni, struct list_head *txlist, int status)
+kiblnd_txlist_done(struct lnet_ni *ni, struct list_head *txlist, int status)
 {
        kib_tx_t *tx;
 
@@ -109,7 +109,7 @@ kiblnd_txlist_done(lnet_ni_t *ni, struct list_head *txlist, int status)
 }
 
 static kib_tx_t *
-kiblnd_get_idle_tx(lnet_ni_t *ni, lnet_nid_t target)
+kiblnd_get_idle_tx(struct lnet_ni *ni, lnet_nid_t target)
 {
        kib_net_t               *net = (kib_net_t *)ni->ni_data;
        struct list_head        *node;
@@ -250,7 +250,7 @@ static void
 kiblnd_handle_completion(kib_conn_t *conn, int txtype, int status, __u64 cookie)
 {
        kib_tx_t    *tx;
-       lnet_ni_t   *ni = conn->ibc_peer->ibp_ni;
+       struct lnet_ni   *ni = conn->ibc_peer->ibp_ni;
        int          idle;
 
        spin_lock(&conn->ibc_lock);
@@ -288,7 +288,7 @@ kiblnd_handle_completion(kib_conn_t *conn, int txtype, int status, __u64 cookie)
 static void
 kiblnd_send_completion(kib_conn_t *conn, int type, int status, __u64 cookie)
 {
-       lnet_ni_t   *ni = conn->ibc_peer->ibp_ni;
+       struct lnet_ni   *ni = conn->ibc_peer->ibp_ni;
        kib_tx_t    *tx = kiblnd_get_idle_tx(ni, conn->ibc_peer->ibp_nid);
 
         if (tx == NULL) {
@@ -309,7 +309,7 @@ kiblnd_handle_rx (kib_rx_t *rx)
 {
         kib_msg_t    *msg = rx->rx_msg;
         kib_conn_t   *conn = rx->rx_conn;
-        lnet_ni_t    *ni = conn->ibc_peer->ibp_ni;
+       struct lnet_ni    *ni = conn->ibc_peer->ibp_ni;
         int           credits = msg->ibm_credits;
         kib_tx_t     *tx;
         int           rc = 0;
@@ -470,7 +470,7 @@ kiblnd_rx_complete (kib_rx_t *rx, int status, int nob)
 {
         kib_msg_t    *msg = rx->rx_msg;
         kib_conn_t   *conn = rx->rx_conn;
-        lnet_ni_t    *ni = conn->ibc_peer->ibp_ni;
+       struct lnet_ni    *ni = conn->ibc_peer->ibp_ni;
         kib_net_t    *net = ni->ni_data;
         int           rc;
         int           err = -EIO;
@@ -591,7 +591,7 @@ kiblnd_fmr_map_tx(kib_net_t *net, kib_tx_t *tx, kib_rdma_desc_t *rd, __u32 nob)
 }
 
 static void
-kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx)
+kiblnd_unmap_tx(struct lnet_ni *ni, kib_tx_t *tx)
 {
        kib_net_t  *net = ni->ni_data;
 
@@ -608,7 +608,7 @@ kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx)
 }
 
 static int
-kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, int nfrags)
+kiblnd_map_tx(struct lnet_ni *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, int nfrags)
 {
        kib_net_t     *net   = ni->ni_data;
        kib_hca_dev_t *hdev  = net->ibn_dev->ibd_hdev;
@@ -649,7 +649,7 @@ kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, int nfrags)
 
 
 static int
-kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
+kiblnd_setup_rd_iov(struct lnet_ni *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
                    unsigned int niov, struct kvec *iov, int offset, int nob)
 {
         kib_net_t          *net = ni->ni_data;
@@ -706,8 +706,8 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
 }
 
 static int
-kiblnd_setup_rd_kiov (lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
-                      int nkiov, lnet_kiov_t *kiov, int offset, int nob)
+kiblnd_setup_rd_kiov(struct lnet_ni *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
+                    int nkiov, lnet_kiov_t *kiov, int offset, int nob)
 {
         kib_net_t          *net = ni->ni_data;
         struct scatterlist *sg;
@@ -906,7 +906,7 @@ static void
 kiblnd_check_sends_locked(kib_conn_t *conn)
 {
         int        ver = conn->ibc_version;
-        lnet_ni_t *ni = conn->ibc_peer->ibp_ni;
+       struct lnet_ni *ni = conn->ibc_peer->ibp_ni;
         kib_tx_t  *tx;
 
         /* Don't send anything until after the connection is established */
@@ -1018,7 +1018,7 @@ kiblnd_tx_complete (kib_tx_t *tx, int status)
 }
 
 static void
-kiblnd_init_tx_msg (lnet_ni_t *ni, kib_tx_t *tx, int type, int body_nob)
+kiblnd_init_tx_msg(struct lnet_ni *ni, kib_tx_t *tx, int type, int body_nob)
 {
        kib_hca_dev_t *hdev = tx->tx_pool->tpo_hdev;
        struct ib_sge *sge = &tx->tx_sge[tx->tx_nwrq];
@@ -1361,7 +1361,7 @@ kiblnd_reconnect_peer(kib_peer_ni_t *peer_ni)
 }
 
 void
-kiblnd_launch_tx (lnet_ni_t *ni, kib_tx_t *tx, lnet_nid_t nid)
+kiblnd_launch_tx(struct lnet_ni *ni, kib_tx_t *tx, lnet_nid_t nid)
 {
         kib_peer_ni_t        *peer_ni;
         kib_peer_ni_t        *peer2;
@@ -1480,11 +1480,11 @@ kiblnd_launch_tx (lnet_ni_t *ni, kib_tx_t *tx, lnet_nid_t nid)
 }
 
 int
-kiblnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
+kiblnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
 {
-        lnet_hdr_t       *hdr = &lntmsg->msg_hdr;
+       struct lnet_hdr *hdr = &lntmsg->msg_hdr;
        int               type = lntmsg->msg_type;
-       lnet_process_id_t target = lntmsg->msg_target;
+       struct lnet_process_id target = lntmsg->msg_target;
        int               target_is_router = lntmsg->msg_target_is_router;
        int               routing = lntmsg->msg_routing;
        unsigned int      payload_niov = lntmsg->msg_niov;
@@ -1650,9 +1650,9 @@ kiblnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 }
 
 static void
-kiblnd_reply (lnet_ni_t *ni, kib_rx_t *rx, lnet_msg_t *lntmsg)
+kiblnd_reply(struct lnet_ni *ni, kib_rx_t *rx, struct lnet_msg *lntmsg)
 {
-        lnet_process_id_t target = lntmsg->msg_target;
+       struct lnet_process_id target = lntmsg->msg_target;
         unsigned int      niov = lntmsg->msg_niov;
        struct kvec      *iov = lntmsg->msg_iov;
         lnet_kiov_t      *kiov = lntmsg->msg_kiov;
@@ -1712,8 +1712,8 @@ kiblnd_reply (lnet_ni_t *ni, kib_rx_t *rx, lnet_msg_t *lntmsg)
 }
 
 int
-kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
-           unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,
+kiblnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
+           int delayed, unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,
            unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
         kib_rx_t    *rx = private;
@@ -2162,7 +2162,7 @@ kiblnd_connreq_done(kib_conn_t *conn, int status)
 
         if (!kiblnd_peer_active(peer_ni) ||        /* peer_ni has been deleted */
             conn->ibc_comms_error != 0) {       /* error has happened already */
-                lnet_ni_t *ni = peer_ni->ibp_ni;
+               struct lnet_ni *ni = peer_ni->ibp_ni;
 
                 /* start to shut down connection */
                 kiblnd_close_conn_locked(conn, -ECONNABORTED);
@@ -2218,7 +2218,7 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob)
         kib_peer_ni_t            *peer_ni;
         kib_peer_ni_t            *peer2;
         kib_conn_t            *conn;
-        lnet_ni_t             *ni  = NULL;
+       struct lnet_ni             *ni  = NULL;
         kib_net_t             *net = NULL;
         lnet_nid_t             nid;
         struct rdma_conn_param cp;
@@ -2772,7 +2772,7 @@ static void
 kiblnd_check_connreply (kib_conn_t *conn, void *priv, int priv_nob)
 {
         kib_peer_ni_t    *peer_ni = conn->ibc_peer;
-        lnet_ni_t     *ni   = peer_ni->ibp_ni;
+       struct lnet_ni *ni   = peer_ni->ibp_ni;
         kib_net_t     *net  = ni->ni_data;
         kib_msg_t     *msg  = priv;
         int            ver  = conn->ibc_version;