staging: lustre: lnet: change lnd_t to proper structure

Change lnd_t from typedef to proper structure.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index 685c5d41f27cb0c665f195f8f3360bb8ff9d2ab6..9a29769401d1218e9a968e6df31c43b9e4dc93d3 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -439,7 +439,7 @@ lnet_net2rnethash(__u32 net)
                ((1U << the_lnet.ln_remote_nets_hbits) - 1)];
 }
 
-extern lnd_t the_lolnd;
+extern struct lnet_lnd the_lolnd;
 extern int avoid_asym_router_failure;
 
 int lnet_cpt_of_nid_locked(lnet_nid_t nid);
@@ -628,8 +628,8 @@ void lnet_me_unlink(struct lnet_me *me);
 void lnet_md_unlink(struct lnet_libmd *md);
 void lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd);
 
-void lnet_register_lnd(lnd_t *lnd);
-void lnet_unregister_lnd(lnd_t *lnd);
+void lnet_register_lnd(struct lnet_lnd *lnd);
+void lnet_unregister_lnd(struct lnet_lnd *lnd);
 
 int lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
                 __u32 local_ip, __u32 peer_ip, int peer_port);

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 59d7143e165a39d1b03ff101ad72940196135335..8a65db26820d39ad456e27a2ec4a5fc11209df03 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -179,7 +179,7 @@ struct lnet_test_peer {
 
 struct lnet_ni;                        /* forward ref */
 
-typedef struct lnet_lnd {
+struct lnet_lnd {
        /* fields managed by portals */
        struct list_head        lnd_list;       /* stash in the LND table */
        int                     lnd_refcount;   /* # active instances */
@@ -243,7 +243,7 @@ typedef struct lnet_lnd {
 
        /* accept a new connection */
        int (*lnd_accept)(struct lnet_ni *ni, struct socket *sock);
-} lnd_t;
+};
 
 struct lnet_tx_queue {
        int                     tq_credits;     /* # tx credits free */
@@ -267,7 +267,7 @@ typedef struct lnet_ni {
        __u32                    *ni_cpts;      /* bond NI on some CPTs */
        lnet_nid_t                ni_nid;       /* interface's NID */
        void                     *ni_data;      /* instance-specific data */
-       lnd_t                    *ni_lnd;       /* procedural interface */
+       struct lnet_lnd          *ni_lnd;       /* procedural interface */
        struct lnet_tx_queue    **ni_tx_queues; /* percpt TX queues */
        int                     **ni_refs;      /* percpt reference count */
        time64_t                  ni_last_alive;/* when I was last alive */

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 6f73454c7ac13c8e1f7a54e9871303fba832472c..29a52639b2a9de087ac0152a3e7f7ed9ce5eed0e 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -38,7 +38,7 @@
 #include <asm/page.h>
 #include "o2iblnd.h"
 
-static lnd_t the_o2iblnd;
+static struct lnet_lnd the_o2iblnd;
 
 struct kib_data kiblnd_data;
 
@@ -2938,7 +2938,7 @@ net_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,

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index 3b08aff598000ee9b85f9d100ae70a98a5fea88e..258507feeb91f50b2b426ec11e25922a78ed1ec8 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -39,7 +39,7 @@
 
 #include "socklnd.h"
 
-static lnd_t the_ksocklnd;
+static struct lnet_lnd the_ksocklnd;
 struct ksock_nal_data ksocknal_data;
 
 static struct ksock_interface *

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index aeb9e6ff75b8b781e4d1c429431e27b4a605e489..d31a50bde0f607d96adfe214f61be686d665bee5 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -265,15 +265,15 @@ static void lnet_assert_wire_constants(void)
        BUILD_BUG_ON((int)sizeof(((struct lnet_hdr *)0)->msg.hello.type) != 4);
 }
 
-static lnd_t *
+static struct lnet_lnd *
 lnet_find_lnd_by_type(__u32 type)
 {
-       lnd_t *lnd;
+       struct lnet_lnd *lnd;
        struct list_head *tmp;
 
        /* holding lnd mutex */
        list_for_each(tmp, &the_lnet.ln_lnds) {
-               lnd = list_entry(tmp, lnd_t, lnd_list);
+               lnd = list_entry(tmp, struct lnet_lnd, lnd_list);
 
                if (lnd->lnd_type == type)
                        return lnd;
@@ -283,7 +283,7 @@ lnet_find_lnd_by_type(__u32 type)
 }
 
 void
-lnet_register_lnd(lnd_t *lnd)
+lnet_register_lnd(struct lnet_lnd *lnd)
 {
        mutex_lock(&the_lnet.ln_lnd_mutex);
 
@@ -300,7 +300,7 @@ lnet_register_lnd(lnd_t *lnd)
 EXPORT_SYMBOL(lnet_register_lnd);
 
 void
-lnet_unregister_lnd(lnd_t *lnd)
+lnet_unregister_lnd(struct lnet_lnd *lnd)
 {
        mutex_lock(&the_lnet.ln_lnd_mutex);
 
@@ -1220,7 +1220,7 @@ lnet_startup_lndni(struct lnet_ni *ni, struct lnet_ioctl_config_data *conf)
        struct lnet_ioctl_config_lnd_tunables *lnd_tunables = NULL;
        int rc = -EINVAL;
        int lnd_type;
-       lnd_t *lnd;
+       struct lnet_lnd *lnd;
        struct lnet_tx_queue *tq;
        int i;
 
@@ -1475,7 +1475,7 @@ void lnet_lib_exit(void)
 
        while (!list_empty(&the_lnet.ln_lnds))
                lnet_unregister_lnd(list_entry(the_lnet.ln_lnds.next,
-                                              lnd_t, lnd_list));
+                                              struct lnet_lnd, lnd_list));
        lnet_destroy_locks();
 }
 

diff --git a/drivers/staging/lustre/lnet/lnet/lo.c b/drivers/staging/lustre/lnet/lnet/lo.c
index 12b6b3a2106c0b52e9cf5bc000388febc0ab9a3f..d11b4f9f6e40ab01904fb9b0f397621a0cbf5f3b 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lo.c
+++ b/drivers/staging/lustre/lnet/lnet/lo.c
@@ -88,7 +88,7 @@ lolnd_startup(lnet_ni_t *ni)
        return 0;
 }
 
-lnd_t the_lolnd = {
+struct lnet_lnd the_lolnd = {
        /* .lnd_list       = */ {&the_lolnd.lnd_list, &the_lolnd.lnd_list},
        /* .lnd_refcount   = */ 0,
        /* .lnd_type       = */ LOLND,