staging: lustre: lnet: change lnet_ni_status_t to proper structure

Change lnet_ni_status_t from typedef to proper structure.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/24566
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@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-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index a1957b1070c41624b3ce3db76c215c0f0fc912b0..942549b46d2ea2963e6986cb2212edd7c59f225c 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -270,7 +270,7 @@ typedef struct lnet_ni {
        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 */
-       lnet_ni_status_t         *ni_status;    /* my health status */
+       struct lnet_ni_status    *ni_status;    /* my health status */
        /* per NI LND tunables */
        struct lnet_ioctl_config_lnd_tunables *ni_lnd_tunables;
        /* equivalent interfaces to use */

diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h
index 0c5d84ec6f47878d9180e988d80ed3fa68cd6371..405bbc6d4785a899a40556e3aa8dc4329614cb01 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@@ -236,18 +236,18 @@ typedef struct {
 
 #define LNET_PROTO_ACCEPTOR_VERSION    1
 
-typedef struct {
+struct lnet_ni_status {
        lnet_nid_t      ns_nid;
        __u32           ns_status;
        __u32           ns_unused;
-} WIRE_ATTR lnet_ni_status_t;
+} WIRE_ATTR;
 
 struct lnet_ping_info {
        __u32                   pi_magic;
        __u32                   pi_features;
        lnet_pid_t              pi_pid;
        __u32                   pi_nnis;
-       lnet_ni_status_t        pi_ni[0];
+       struct lnet_ni_status   pi_ni[0];
 } WIRE_ATTR;
 
 typedef struct lnet_counters {

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index ae388b2819b0c885484ba9bc0625ba0c22e62b28..3b2488f704624253b679864fe93b5e8a65add0b6 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -981,7 +981,7 @@ lnet_ping_md_unlink(struct lnet_ping_info *pinfo, lnet_handle_md_t *md_handle)
 static void
 lnet_ping_info_install_locked(struct lnet_ping_info *ping_info)
 {
-       lnet_ni_status_t *ns;
+       struct lnet_ni_status *ns;
        lnet_ni_t *ni;
        int i = 0;
 

diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index 269b5e7f624f7d01d39a904cbcf7a3d1a5628ce6..cf22525d7129bcf9e9b20d9110abd64fcbbeb552 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -624,7 +624,7 @@ void
 lnet_swap_pinginfo(struct lnet_ping_info *info)
 {
        int i;
-       lnet_ni_status_t *stat;
+       struct lnet_ni_status *stat;
 
        __swab32s(&info->pi_magic);
        __swab32s(&info->pi_features);
@@ -683,7 +683,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd)
                }
 
                for (i = 0; i < info->pi_nnis && i < LNET_MAX_RTR_NIS; i++) {
-                       lnet_ni_status_t *stat = &info->pi_ni[i];
+                       struct lnet_ni_status *stat = &info->pi_ni[i];
                        lnet_nid_t nid = stat->ns_nid;
 
                        if (nid == LNET_NID_ANY) {