Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21e86fd3 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: change lnet_ni_t to proper structure 



Change lnet_ni_t from typedef to proper structure.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831


Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0fffc261

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+21 −21
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ lnet_isrouter(lnet_peer_t *lp) 
}



static inline void

lnet_ni_addref_locked(lnet_ni_t *ni, int cpt)

lnet_ni_addref_locked(struct lnet_ni *ni, int cpt)

{

	LASSERT(cpt >= 0 && cpt < LNET_CPT_NUMBER);

	LASSERT(*ni->ni_refs[cpt] >= 0);
@@ -397,7 +397,7 @@ lnet_ni_addref_locked(lnet_ni_t *ni, int cpt) 
}



static inline void

lnet_ni_addref(lnet_ni_t *ni)

lnet_ni_addref(struct lnet_ni *ni)

{

	lnet_net_lock(0);

	lnet_ni_addref_locked(ni, 0);
@@ -405,7 +405,7 @@ lnet_ni_addref(lnet_ni_t *ni) 
}



static inline void

lnet_ni_decref_locked(lnet_ni_t *ni, int cpt)

lnet_ni_decref_locked(struct lnet_ni *ni, int cpt)

{

	LASSERT(cpt >= 0 && cpt < LNET_CPT_NUMBER);

	LASSERT(*ni->ni_refs[cpt] > 0);
@@ -414,15 +414,15 @@ lnet_ni_decref_locked(lnet_ni_t *ni, int cpt) 
}



static inline void

lnet_ni_decref(lnet_ni_t *ni)

lnet_ni_decref(struct lnet_ni *ni)

{

	lnet_net_lock(0);

	lnet_ni_decref_locked(ni, 0);

	lnet_net_unlock(0);

}



void lnet_ni_free(lnet_ni_t *ni);

lnet_ni_t *

void lnet_ni_free(struct lnet_ni *ni);

struct lnet_ni *

lnet_ni_alloc(__u32 net, struct cfs_expr_list *el, struct list_head *nilist);



static inline int
@@ -444,16 +444,16 @@ extern int avoid_asym_router_failure; 


int lnet_cpt_of_nid_locked(lnet_nid_t nid);

int lnet_cpt_of_nid(lnet_nid_t nid);

lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt);

lnet_ni_t *lnet_net2ni_locked(__u32 net, int cpt);

lnet_ni_t *lnet_net2ni(__u32 net);

struct lnet_ni *lnet_nid2ni_locked(lnet_nid_t nid, int cpt);

struct lnet_ni *lnet_net2ni_locked(__u32 net, int cpt);

struct lnet_ni *lnet_net2ni(__u32 net);



extern int portal_rotor;



int lnet_lib_init(void);

void lnet_lib_exit(void);



int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, unsigned long when);

int lnet_notify(struct lnet_ni *ni, lnet_nid_t peer, int alive, unsigned long when);

void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive,

			unsigned long when);

int lnet_add_route(__u32 net, __u32 hops, lnet_nid_t gateway_nid,
@@ -552,26 +552,26 @@ int lnet_portals_create(void); 
void lnet_portals_destroy(void);



/* message functions */

int lnet_parse(lnet_ni_t *ni, struct lnet_hdr *hdr,

int lnet_parse(struct lnet_ni *ni, struct lnet_hdr *hdr,

	       lnet_nid_t fromnid, void *private, int rdma_req);

int lnet_parse_local(lnet_ni_t *ni, struct lnet_msg *msg);

int lnet_parse_forward_locked(lnet_ni_t *ni, struct lnet_msg *msg);

int lnet_parse_local(struct lnet_ni *ni, struct lnet_msg *msg);

int lnet_parse_forward_locked(struct lnet_ni *ni, struct lnet_msg *msg);



void lnet_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,

void lnet_recv(struct lnet_ni *ni, void *private, struct lnet_msg *msg,

	       int delayed, unsigned int offset, unsigned int mlen,

	       unsigned int rlen);

void lnet_ni_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,

void lnet_ni_recv(struct lnet_ni *ni, void *private, struct lnet_msg *msg,

		  int delayed, unsigned int offset,

		  unsigned int mlen, unsigned int rlen);



struct lnet_msg *lnet_create_reply_msg(lnet_ni_t *ni,

struct lnet_msg *lnet_create_reply_msg(struct lnet_ni *ni,

				       struct lnet_msg *get_msg);

void lnet_set_reply_msg_len(lnet_ni_t *ni, struct lnet_msg *msg,

void lnet_set_reply_msg_len(struct lnet_ni *ni, struct lnet_msg *msg,

			    unsigned int len);



void lnet_finalize(lnet_ni_t *ni, struct lnet_msg *msg, int rc);

void lnet_finalize(struct lnet_ni *ni, struct lnet_msg *msg, int rc);



void lnet_drop_message(lnet_ni_t *ni, int cpt, void *private,

void lnet_drop_message(struct lnet_ni *ni, int cpt, void *private,

		       unsigned int nob);

void lnet_drop_delayed_msg_list(struct list_head *head, char *reason);

void lnet_recv_delayed_msg_list(struct list_head *head);
@@ -662,7 +662,7 @@ int lnet_sock_connect(struct socket **sockp, int *fatal, 
void libcfs_sock_release(struct socket *sock);



int lnet_peers_start_down(void);

int lnet_peer_buffer_credits(lnet_ni_t *ni);

int lnet_peer_buffer_credits(struct lnet_ni *ni);



int lnet_router_checker_start(void);

void lnet_router_checker_stop(void);
@@ -677,7 +677,7 @@ int lnet_net_unique(__u32 net, struct list_head *nilist); 
int lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid, int cpt);

lnet_peer_t *lnet_find_peer_locked(struct lnet_peer_table *ptable,

				   lnet_nid_t nid);

void lnet_peer_tables_cleanup(lnet_ni_t *ni);

void lnet_peer_tables_cleanup(struct lnet_ni *ni);

void lnet_peer_tables_destroy(void);

int lnet_peer_tables_create(void);

void lnet_debug_peer(lnet_nid_t nid);

drivers/staging/lustre/include/linux/lnet/lib-types.h

+5 −5
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ struct lnet_tx_queue { 
	struct list_head	tq_delayed;	/* delayed TXs */

};



typedef struct lnet_ni {

struct lnet_ni {

	spinlock_t		  ni_lock;

	struct list_head	  ni_list;	/* chain on ln_nis */

	struct list_head	  ni_cptlist;	/* chain on ln_nis_cpt */
@@ -278,7 +278,7 @@ typedef struct lnet_ni { 
	char			 *ni_interfaces[LNET_MAX_INTERFACES];

	/* original net namespace */

	struct net		 *ni_net_ns;

} lnet_ni_t;

};



#define LNET_PROTO_PING_MATCHBITS	0x8000000000000000LL
@@ -336,7 +336,7 @@ typedef struct lnet_peer { 
	unsigned long		 lp_last_alive;	/* when I was last alive */

	unsigned long		 lp_last_query;	/* when lp_ni was queried

						   last time */

	lnet_ni_t		*lp_ni;		/* interface peer is on */

	struct lnet_ni		*lp_ni;		/* interface peer is on */

	lnet_nid_t		 lp_nid;	/* peer's NID */

	int			 lp_refcount;	/* # refs */

	int			 lp_cpt;	/* CPT this peer attached on */
@@ -364,7 +364,7 @@ struct lnet_peer_table { 


/*

 * peer aliveness is enabled only on routers for peers in a network where the

 * lnet_ni_t::ni_peertimeout has been set to a positive value

 * lnet_ni::ni_peertimeout has been set to a positive value

 */

#define lnet_peer_aliveness_enabled(lp) (the_lnet.ln_routing && \

					 (lp)->lp_ni->ni_peertimeout > 0)
@@ -585,7 +585,7 @@ typedef struct { 
	struct list_head		  ln_nis_cpt;

	/* dying LND instances */

	struct list_head		  ln_nis_zombie;

	lnet_ni_t			 *ln_loni;	/* the loopback NI */

	struct lnet_ni			 *ln_loni;	/* the loopback NI */



	/* remote networks with routes to them */

	struct list_head		 *ln_remote_nets_hash;

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c

+14 −12
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int kiblnd_unpack_rd(struct kib_msg *msg, int flip) 
	return 0;

}



void kiblnd_pack_msg(lnet_ni_t *ni, struct kib_msg *msg, int version,

void kiblnd_pack_msg(struct lnet_ni *ni, struct kib_msg *msg, int version,

		     int credits, lnet_nid_t dstnid, __u64 dststamp)

{

	struct kib_net *net = ni->ni_data;
@@ -313,7 +313,8 @@ int kiblnd_unpack_msg(struct kib_msg *msg, int nob) 
	return 0;

}



int kiblnd_create_peer(lnet_ni_t *ni, struct kib_peer **peerp, lnet_nid_t nid)

int kiblnd_create_peer(struct lnet_ni *ni, struct kib_peer **peerp,

		       lnet_nid_t nid)

{

	struct kib_peer *peer;

	struct kib_net *net = ni->ni_data;
@@ -412,7 +413,7 @@ void kiblnd_unlink_peer_locked(struct kib_peer *peer) 
	kiblnd_peer_decref(peer);

}



static int kiblnd_get_peer_info(lnet_ni_t *ni, int index,

static int kiblnd_get_peer_info(struct lnet_ni *ni, int index,

				lnet_nid_t *nidp, int *count)

{

	struct kib_peer *peer;
@@ -468,7 +469,7 @@ static void kiblnd_del_peer_locked(struct kib_peer *peer) 
	 */

}



static int kiblnd_del_peer(lnet_ni_t *ni, lnet_nid_t nid)

static int kiblnd_del_peer(struct lnet_ni *ni, lnet_nid_t nid)

{

	LIST_HEAD(zombies);

	struct list_head *ptmp;
@@ -520,7 +521,7 @@ static int kiblnd_del_peer(lnet_ni_t *ni, lnet_nid_t nid) 
	return rc;

}



static struct kib_conn *kiblnd_get_conn_by_idx(lnet_ni_t *ni, int index)

static struct kib_conn *kiblnd_get_conn_by_idx(struct lnet_ni *ni, int index)

{

	struct kib_peer *peer;

	struct list_head *ptmp;
@@ -947,7 +948,7 @@ int kiblnd_close_stale_conns_locked(struct kib_peer *peer, 
	return count;

}



static int kiblnd_close_matching_conns(lnet_ni_t *ni, lnet_nid_t nid)

static int kiblnd_close_matching_conns(struct lnet_ni *ni, lnet_nid_t nid)

{

	struct kib_peer *peer;

	struct list_head *ptmp;
@@ -992,7 +993,7 @@ static int kiblnd_close_matching_conns(lnet_ni_t *ni, lnet_nid_t nid) 
	return !count ? -ENOENT : 0;

}



static int kiblnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg)

static int kiblnd_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg)

{

	struct libcfs_ioctl_data *data = arg;

	int rc = -EINVAL;
@@ -1045,7 +1046,8 @@ static int kiblnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) 
	return rc;

}



static void kiblnd_query(lnet_ni_t *ni, lnet_nid_t nid, unsigned long *when)

static void kiblnd_query(struct lnet_ni *ni, lnet_nid_t nid,

			 unsigned long *when)

{

	unsigned long last_alive = 0;

	unsigned long now = cfs_time_current();
@@ -2143,8 +2145,8 @@ static void kiblnd_net_fini_pools(struct kib_net *net) 
	}

}



static int kiblnd_net_init_pools(struct kib_net *net, lnet_ni_t *ni, __u32 *cpts,

				 int ncpts)

static int kiblnd_net_init_pools(struct kib_net *net, struct lnet_ni *ni,

				 __u32 *cpts, int ncpts)

{

	struct lnet_ioctl_config_o2iblnd_tunables *tunables;

	int cpt;
@@ -2587,7 +2589,7 @@ static void kiblnd_base_shutdown(void) 
	module_put(THIS_MODULE);

}



static void kiblnd_shutdown(lnet_ni_t *ni)

static void kiblnd_shutdown(struct lnet_ni *ni)

{

	struct kib_net *net = ni->ni_data;

	rwlock_t *g_lock = &kiblnd_data.kib_global_lock;
@@ -2844,7 +2846,7 @@ static struct kib_dev *kiblnd_dev_search(char *ifname) 
	return alias;

}



static int kiblnd_startup(lnet_ni_t *ni)

static int kiblnd_startup(struct lnet_ni *ni)

{

	char *ifname;

	struct kib_dev *ibdev = NULL;

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h

+9 −8
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ struct kib_conn { 
struct kib_peer {

	struct list_head ibp_list;        /* stash on global peer list */

	lnet_nid_t       ibp_nid;         /* who's on the other end(s) */

	lnet_ni_t        *ibp_ni;         /* LNet interface */

	struct lnet_ni	*ibp_ni;         /* LNet interface */

	struct list_head ibp_conns;       /* all active connections */

	struct list_head ibp_tx_queue;    /* msgs waiting for a conn */

	__u64            ibp_incarnation; /* incarnation of peer */
@@ -763,7 +763,7 @@ static inline int 
kiblnd_need_noop(struct kib_conn *conn)

{

	struct lnet_ioctl_config_o2iblnd_tunables *tunables;

	lnet_ni_t *ni = conn->ibc_peer->ibp_ni;

	struct lnet_ni *ni = conn->ibc_peer->ibp_ni;



	LASSERT(conn->ibc_state >= IBLND_CONN_ESTABLISHED);

	tunables = &ni->ni_lnd_tunables->lt_tun_u.lt_o2ib;
@@ -1002,7 +1002,8 @@ int kiblnd_cm_callback(struct rdma_cm_id *cmid, 
int  kiblnd_translate_mtu(int value);



int  kiblnd_dev_failover(struct kib_dev *dev);

int  kiblnd_create_peer(lnet_ni_t *ni, struct kib_peer **peerp, lnet_nid_t nid);

int kiblnd_create_peer(struct lnet_ni *ni, struct kib_peer **peerp,

		       lnet_nid_t nid);

void kiblnd_destroy_peer(struct kib_peer *peer);

bool kiblnd_reconnect_peer(struct kib_peer *peer);

void kiblnd_destroy_dev(struct kib_dev *dev);
@@ -1019,19 +1020,19 @@ void kiblnd_destroy_conn(struct kib_conn *conn, bool free_conn); 
void kiblnd_close_conn(struct kib_conn *conn, int error);

void kiblnd_close_conn_locked(struct kib_conn *conn, int error);



void kiblnd_launch_tx(lnet_ni_t *ni, struct kib_tx *tx, lnet_nid_t nid);

void kiblnd_txlist_done(lnet_ni_t *ni, struct list_head *txlist,

void kiblnd_launch_tx(struct lnet_ni *ni, struct kib_tx *tx, lnet_nid_t nid);

void kiblnd_txlist_done(struct lnet_ni *ni, struct list_head *txlist,

			int status);



void kiblnd_qp_event(struct ib_event *event, void *arg);

void kiblnd_cq_event(struct ib_event *event, void *arg);

void kiblnd_cq_completion(struct ib_cq *cq, void *arg);



void kiblnd_pack_msg(lnet_ni_t *ni, struct kib_msg *msg, int version,

void kiblnd_pack_msg(struct lnet_ni *ni, struct kib_msg *msg, int version,

		     int credits, lnet_nid_t dstnid, __u64 dststamp);

int  kiblnd_unpack_msg(struct kib_msg *msg, int nob);

int  kiblnd_post_rx(struct kib_rx *rx, int credit);



int kiblnd_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg);

int kiblnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,

int kiblnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg);

int kiblnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,

		int delayed, struct iov_iter *to, unsigned int rlen);

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+28 −25
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ 


static void kiblnd_peer_alive(struct kib_peer *peer);

static void kiblnd_peer_connect_failed(struct kib_peer *peer, int active, int error);

static void kiblnd_init_tx_msg(lnet_ni_t *ni, struct kib_tx *tx,

static void kiblnd_init_tx_msg(struct lnet_ni *ni, struct kib_tx *tx,

			       int type, int body_nob);

static int kiblnd_init_rdma(struct kib_conn *conn, struct kib_tx *tx, int type,

			    int resid, struct kib_rdma_desc *dstrd,

			    __u64 dstcookie);

static void kiblnd_queue_tx_locked(struct kib_tx *tx, struct kib_conn *conn);

static void kiblnd_queue_tx(struct kib_tx *tx, struct kib_conn *conn);

static void kiblnd_unmap_tx(lnet_ni_t *ni, struct kib_tx *tx);

static void kiblnd_unmap_tx(struct lnet_ni *ni, struct kib_tx *tx);

static void kiblnd_check_sends_locked(struct kib_conn *conn);



static void

kiblnd_tx_done(lnet_ni_t *ni, struct kib_tx *tx)

kiblnd_tx_done(struct lnet_ni *ni, struct kib_tx *tx)

{

	struct lnet_msg *lntmsg[2];

	struct kib_net *net = ni->ni_data;
@@ -94,7 +94,7 @@ kiblnd_tx_done(lnet_ni_t *ni, struct kib_tx *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)

{

	struct kib_tx *tx;
@@ -110,7 +110,7 @@ kiblnd_txlist_done(lnet_ni_t *ni, struct list_head *txlist, int status) 
}



static struct kib_tx *

kiblnd_get_idle_tx(lnet_ni_t *ni, lnet_nid_t target)

kiblnd_get_idle_tx(struct lnet_ni *ni, lnet_nid_t target)

{

	struct kib_net *net = (struct kib_net *)ni->ni_data;

	struct list_head *node;
@@ -249,7 +249,7 @@ static void 
kiblnd_handle_completion(struct kib_conn *conn, int txtype, int status, __u64 cookie)

{

	struct kib_tx *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);
@@ -286,7 +286,7 @@ kiblnd_handle_completion(struct kib_conn *conn, int txtype, int status, __u64 co 
static void

kiblnd_send_completion(struct kib_conn *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;

	struct kib_tx *tx = kiblnd_get_idle_tx(ni, conn->ibc_peer->ibp_nid);



	if (!tx) {
@@ -307,7 +307,7 @@ kiblnd_handle_rx(struct kib_rx *rx) 
{

	struct kib_msg *msg = rx->rx_msg;

	struct kib_conn *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;

	struct kib_tx *tx;

	int rc = 0;
@@ -468,7 +468,7 @@ kiblnd_rx_complete(struct kib_rx *rx, int status, int nob) 
{

	struct kib_msg *msg = rx->rx_msg;

	struct kib_conn *conn = rx->rx_conn;

	lnet_ni_t *ni = conn->ibc_peer->ibp_ni;

	struct lnet_ni *ni = conn->ibc_peer->ibp_ni;

	struct kib_net *net = ni->ni_data;

	int rc;

	int err = -EIO;
@@ -590,7 +590,7 @@ kiblnd_fmr_map_tx(struct kib_net *net, struct kib_tx *tx, struct kib_rdma_desc * 
	return 0;

}



static void kiblnd_unmap_tx(lnet_ni_t *ni, struct kib_tx *tx)

static void kiblnd_unmap_tx(struct lnet_ni *ni, struct kib_tx *tx)

{

	struct kib_net *net = ni->ni_data;
@@ -606,8 +606,8 @@ static void kiblnd_unmap_tx(lnet_ni_t *ni, struct kib_tx *tx) 
	}

}



static int kiblnd_map_tx(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd,

			 int nfrags)

static int kiblnd_map_tx(struct lnet_ni *ni, struct kib_tx *tx,

			 struct kib_rdma_desc *rd, int nfrags)

{

	struct kib_net *net = ni->ni_data;

	struct kib_hca_dev *hdev = net->ibn_dev->ibd_hdev;
@@ -639,8 +639,9 @@ static int kiblnd_map_tx(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc 
}



static int

kiblnd_setup_rd_iov(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd,

		    unsigned int niov, const struct kvec *iov, int offset, int nob)

kiblnd_setup_rd_iov(struct lnet_ni *ni, struct kib_tx *tx,

		    struct kib_rdma_desc *rd, unsigned int niov,

		    const struct kvec *iov, int offset, int nob)

{

	struct kib_net *net = ni->ni_data;

	struct page *page;
@@ -696,8 +697,9 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd, 
}



static int

kiblnd_setup_rd_kiov(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd,

		     int nkiov, const lnet_kiov_t *kiov, int offset, int nob)

kiblnd_setup_rd_kiov(struct lnet_ni *ni, struct kib_tx *tx,

		     struct kib_rdma_desc *rd, int nkiov,

		     const lnet_kiov_t *kiov, int offset, int nob)

{

	struct kib_net *net = ni->ni_data;

	struct scatterlist *sg;
@@ -899,7 +901,7 @@ static void 
kiblnd_check_sends_locked(struct kib_conn *conn)

{

	int ver = conn->ibc_version;

	lnet_ni_t *ni = conn->ibc_peer->ibp_ni;

	struct lnet_ni *ni = conn->ibc_peer->ibp_ni;

	struct kib_tx *tx;



	/* Don't send anything until after the connection is established */
@@ -1011,7 +1013,8 @@ kiblnd_tx_complete(struct kib_tx *tx, int status) 
}



static void

kiblnd_init_tx_msg(lnet_ni_t *ni, struct kib_tx *tx, int type, int body_nob)

kiblnd_init_tx_msg(struct lnet_ni *ni, struct kib_tx *tx, int type,

		   int body_nob)

{

	struct kib_hca_dev *hdev = tx->tx_pool->tpo_hdev;

	struct ib_sge *sge = &tx->tx_sge[tx->tx_nwrq];
@@ -1353,7 +1356,7 @@ kiblnd_reconnect_peer(struct kib_peer *peer) 
}



void

kiblnd_launch_tx(lnet_ni_t *ni, struct kib_tx *tx, lnet_nid_t nid)

kiblnd_launch_tx(struct lnet_ni *ni, struct kib_tx *tx, lnet_nid_t nid)

{

	struct kib_peer *peer;

	struct kib_peer *peer2;
@@ -1475,7 +1478,7 @@ kiblnd_launch_tx(lnet_ni_t *ni, struct kib_tx *tx, lnet_nid_t nid) 
}



int

kiblnd_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg)

kiblnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)

{

	struct lnet_hdr *hdr = &lntmsg->msg_hdr;

	int type = lntmsg->msg_type;
@@ -1648,7 +1651,7 @@ kiblnd_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg) 
}



static void

kiblnd_reply(lnet_ni_t *ni, struct kib_rx *rx, struct lnet_msg *lntmsg)

kiblnd_reply(struct lnet_ni *ni, struct kib_rx *rx, struct lnet_msg *lntmsg)

{

	lnet_process_id_t target = lntmsg->msg_target;

	unsigned int niov = lntmsg->msg_niov;
@@ -1709,7 +1712,7 @@ kiblnd_reply(lnet_ni_t *ni, struct kib_rx *rx, struct lnet_msg *lntmsg) 
}



int

kiblnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,

kiblnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,

	    int delayed, struct iov_iter *to, unsigned int rlen)

{

	struct kib_rx *rx = private;
@@ -2157,7 +2160,7 @@ kiblnd_connreq_done(struct kib_conn *conn, int status) 


	if (!kiblnd_peer_active(peer) ||	/* peer has been deleted */

	    conn->ibc_comms_error) {       /* error has happened already */

		lnet_ni_t *ni = peer->ibp_ni;

		struct lnet_ni *ni = peer->ibp_ni;



		/* start to shut down connection */

		kiblnd_close_conn_locked(conn, -ECONNABORTED);
@@ -2214,7 +2217,7 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob) 
	struct kib_peer *peer;

	struct kib_peer *peer2;

	struct kib_conn *conn;

	lnet_ni_t *ni  = NULL;

	struct lnet_ni *ni  = NULL;

	struct kib_net *net = NULL;

	lnet_nid_t nid;

	struct rdma_conn_param cp;
@@ -2776,7 +2779,7 @@ static void 
kiblnd_check_connreply(struct kib_conn *conn, void *priv, int priv_nob)

{

	struct kib_peer *peer = conn->ibc_peer;

	lnet_ni_t *ni = peer->ibp_ni;

	struct lnet_ni *ni = peer->ibp_ni;

	struct kib_net *net = ni->ni_data;

	struct kib_msg *msg = priv;

	int ver = conn->ibc_version;