X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Fklnds%2Fo2iblnd%2Fo2iblnd.c;h=5a2850afdab9a9f7e487ace80a1762c0f8548c97;hb=05ad99f1f3a9f85756bf3355505722bb4f20f420;hp=0124636755155cb94d45951368792eafa6b18f53;hpb=1e42682aeadb0f80dd6e9bfd45abe17221b698bf;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index 0124636..5a2850a 100644
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -37,7 +37,7 @@
 #include <asm/page.h>
 #include "o2iblnd.h"
 
-static lnd_t the_o2iblnd;
+static struct lnet_lnd the_o2iblnd;
 
 kib_data_t              kiblnd_data;
 
@@ -176,8 +176,8 @@ kiblnd_unpack_rd(kib_msg_t *msg, int flip)
 }
 
 void
-kiblnd_pack_msg (lnet_ni_t *ni, kib_msg_t *msg, int version,
-                 int credits, lnet_nid_t dstnid, __u64 dststamp)
+kiblnd_pack_msg(struct lnet_ni *ni, kib_msg_t *msg, int version,
+		int credits, lnet_nid_t dstnid, __u64 dststamp)
 {
         kib_net_t *net = ni->ni_data;
 
@@ -313,7 +313,7 @@ kiblnd_unpack_msg(kib_msg_t *msg, int nob)
 }
 
 int
-kiblnd_create_peer(lnet_ni_t *ni, kib_peer_ni_t **peerp, lnet_nid_t nid)
+kiblnd_create_peer(struct lnet_ni *ni, kib_peer_ni_t **peerp, lnet_nid_t nid)
 {
 	kib_peer_ni_t	*peer_ni;
 	kib_net_t	*net = ni->ni_data;
@@ -420,7 +420,7 @@ kiblnd_unlink_peer_locked (kib_peer_ni_t *peer_ni)
 }
 
 static int
-kiblnd_get_peer_info(lnet_ni_t *ni, int index,
+kiblnd_get_peer_info(struct lnet_ni *ni, int index,
 		     lnet_nid_t *nidp, int *count)
 {
 	kib_peer_ni_t		*peer_ni;
@@ -478,7 +478,7 @@ kiblnd_del_peer_locked (kib_peer_ni_t *peer_ni)
 }
 
 static int
-kiblnd_del_peer (lnet_ni_t *ni, lnet_nid_t nid)
+kiblnd_del_peer(struct lnet_ni *ni, lnet_nid_t nid)
 {
 	struct list_head	zombies = LIST_HEAD_INIT(zombies);
 	struct list_head	*ptmp;
@@ -530,7 +530,7 @@ kiblnd_del_peer (lnet_ni_t *ni, lnet_nid_t nid)
 }
 
 static kib_conn_t *
-kiblnd_get_conn_by_idx(lnet_ni_t *ni, int index)
+kiblnd_get_conn_by_idx(struct lnet_ni *ni, int index)
 {
 	kib_peer_ni_t		*peer_ni;
 	struct list_head	*ptmp;
@@ -1046,7 +1046,7 @@ kiblnd_close_stale_conns_locked(kib_peer_ni_t *peer_ni,
 }
 
 static int
-kiblnd_close_matching_conns(lnet_ni_t *ni, lnet_nid_t nid)
+kiblnd_close_matching_conns(struct lnet_ni *ni, lnet_nid_t nid)
 {
 	kib_peer_ni_t		*peer_ni;
 	struct list_head	*ptmp;
@@ -1092,7 +1092,7 @@ kiblnd_close_matching_conns(lnet_ni_t *ni, lnet_nid_t nid)
 }
 
 static int
-kiblnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg)
+kiblnd_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg)
 {
         struct libcfs_ioctl_data *data = arg;
         int                       rc = -EINVAL;
@@ -1146,7 +1146,7 @@ kiblnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg)
 }
 
 static void
-kiblnd_query(lnet_ni_t *ni, lnet_nid_t nid, cfs_time_t *when)
+kiblnd_query(struct lnet_ni *ni, lnet_nid_t nid, cfs_time_t *when)
 {
 	cfs_time_t	last_alive = 0;
 	cfs_time_t	now = cfs_time_current();
@@ -2394,7 +2394,8 @@ kiblnd_net_fini_pools(kib_net_t *net)
 }
 
 static int
-kiblnd_net_init_pools(kib_net_t *net, lnet_ni_t *ni, __u32 *cpts, int ncpts)
+kiblnd_net_init_pools(kib_net_t *net, struct lnet_ni *ni, __u32 *cpts,
+		      int ncpts)
 {
 	struct lnet_ioctl_config_o2iblnd_tunables *tunables;
 	unsigned long	flags;
@@ -2906,7 +2907,7 @@ kiblnd_base_shutdown(void)
 }
 
 static void
-kiblnd_shutdown (lnet_ni_t *ni)
+kiblnd_shutdown(struct lnet_ni *ni)
 {
         kib_net_t        *net = ni->ni_data;
 	rwlock_t     *g_lock = &kiblnd_data.kib_global_lock;
@@ -3174,7 +3175,7 @@ kiblnd_dev_search(char *ifname)
 }
 
 static int
-kiblnd_startup (lnet_ni_t *ni)
+kiblnd_startup(struct lnet_ni *ni)
 {
         char                     *ifname;
         kib_dev_t                *ibdev = NULL;
@@ -3266,7 +3267,7 @@ failed:
         return -ENETDOWN;
 }
 
-static lnd_t the_o2iblnd = {
+static struct lnet_lnd the_o2iblnd = {
 	.lnd_type	= O2IBLND,
 	.lnd_startup	= kiblnd_startup,
 	.lnd_shutdown	= kiblnd_shutdown,