staging: lustre: lnet: change lstcon_node_ent_t to proper structure

Change lstcon_node_ent_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/24188
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@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/lnetst.h b/drivers/staging/lustre/include/linux/lnet/lnetst.h
index b72128755b9a9c61c6e193f2572d9ac0d2b4821d..32522394be8b13d3e3df359cebc2b17bb4b68db4 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@@ -85,10 +85,10 @@ struct lst_bid {
 #define LST_NODE_DOWN          0x4     /* node is down */
 #define LST_NODE_UNKNOWN       0x8     /* node not in session */
 
-typedef struct {
+struct lstcon_node_ent {
        lnet_process_id_t       nde_id;         /* id of node */
        int                     nde_state;      /* state of node */
-} lstcon_node_ent_t;           /*** node entry, for list_group command */
+};                             /*** node entry, for list_group command */
 
 typedef struct {
        int     nle_nnode;      /* # of nodes */
@@ -349,7 +349,7 @@ typedef struct {
                                                                group */
        int __user              *lstio_grp_idxp;        /* IN/OUT: node index */
        int __user              *lstio_grp_ndentp;      /* IN/OUT: # of nodent */
-       lstcon_node_ent_t __user *lstio_grp_dentsp;     /* OUT: nodent array */
+       struct lstcon_node_ent __user *lstio_grp_dentsp;        /* OUT: nodent array */
 } lstio_group_info_args_t;
 
 #define LST_DEFAULT_BATCH      "batch"                 /* default batch name */
@@ -417,7 +417,7 @@ typedef struct {
 
        int __user              *lstio_bat_idxp;        /* IN/OUT: index of node */
        int __user              *lstio_bat_ndentp;      /* IN/OUT: # of nodent */
-       lstcon_node_ent_t __user *lstio_bat_dentsp;     /* array of nodent */
+       struct lstcon_node_ent __user *lstio_bat_dentsp;/* array of nodent */
 } lstio_batch_info_args_t;
 
 /* add stat in session */

diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 02dbfef94956da88e3dfb8568eab8da8ca6a42d6..8855d2e19e67f58f29f604183d58b39201379e43 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -741,7 +741,7 @@ lstcon_group_list(int index, int len, char __user *name_up)
 
 static int
 lstcon_nodes_getent(struct list_head *head, int *index_p,
-                   int *count_p, lstcon_node_ent_t __user *dents_up)
+                   int *count_p, struct lstcon_node_ent __user *dents_up)
 {
        struct lstcon_ndlink *ndl;
        struct lstcon_node *nd;
@@ -782,7 +782,7 @@ lstcon_nodes_getent(struct list_head *head, int *index_p,
 int
 lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
                  int *index_p, int *count_p,
-                 lstcon_node_ent_t __user *dents_up)
+                 struct lstcon_node_ent __user *dents_up)
 {
        lstcon_ndlist_ent_t *gentp;
        struct lstcon_group *grp;
@@ -928,7 +928,7 @@ lstcon_batch_list(int index, int len, char __user *name_up)
 int
 lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
                  int server, int testidx, int *index_p, int *ndent_p,
-                 lstcon_node_ent_t __user *dents_up)
+                 struct lstcon_node_ent __user *dents_up)
 {
        lstcon_test_batch_ent_t *entp;
        struct list_head *clilst;

diff --git a/drivers/staging/lustre/lnet/selftest/console.h b/drivers/staging/lustre/lnet/selftest/console.h
index b37c37ea3864a7d99d0f5ffb305d44f309472f02..f6cc69448b600dce0590bc7a1719b8fb2d55c1d0 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.h
+++ b/drivers/staging/lustre/lnet/selftest/console.h
@@ -215,7 +215,7 @@ int lstcon_nodes_remove(char *name, int nnd, lnet_process_id_t __user *nds_up,
                        struct list_head __user *result_up);
 int lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gent_up,
                      int *index_p, int *ndent_p,
-                     lstcon_node_ent_t __user *ndents_up);
+                     struct lstcon_node_ent __user *ndents_up);
 int lstcon_group_list(int idx, int len, char __user *name_up);
 int lstcon_batch_add(char *name);
 int lstcon_batch_run(char *name, int timeout,
@@ -229,7 +229,7 @@ int lstcon_batch_del(char *name);
 int lstcon_batch_list(int idx, int namelen, char __user *name_up);
 int lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
                      int server, int testidx, int *index_p,
-                     int *ndent_p, lstcon_node_ent_t __user *dents_up);
+                     int *ndent_p, struct lstcon_node_ent __user *dents_up);
 int lstcon_group_stat(char *grp_name, int timeout,
                      struct list_head __user *result_up);
 int lstcon_nodes_stat(int count, lnet_process_id_t __user *ids_up,