staging: lustre: lnet: change lstcon_rpc_ent_t to proper structure

Change lstcon_rpc_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 adc03fe4fbc6a699ed6565101d271c586d1e5d09..f5c68c13256686505cc4ba6aa244fb93fa078866 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@@ -124,7 +124,7 @@ struct lstcon_test_batch_ent {
 };                             /*** test/batch verbose information entry,
                                 *** for list_batch command */
 
-typedef struct {
+struct lstcon_rpc_ent {
        struct list_head        rpe_link;       /* link chain */
        lnet_process_id_t       rpe_peer;       /* peer's id */
        struct timeval          rpe_stamp;      /* time stamp of RPC */
@@ -135,7 +135,7 @@ typedef struct {
        int                     rpe_fwk_errno;  /* framework errno */
        int                     rpe_priv[4];    /* private data */
        char                    rpe_payload[0]; /* private reply payload */
-} lstcon_rpc_ent_t;
+};
 
 typedef struct {
        int     trs_rpc_stat[4];        /* RPCs stat (0: total

diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c
index 84ae01091b61c0e9de53c35b7b378f0ed7ad824a..bc924f9e8727c7a5c557a7eb2e275a738f881061 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -469,7 +469,7 @@ lstcon_rpc_trans_interpreter(struct lstcon_rpc_trans *trans,
 {
        struct list_head tmp;
        struct list_head __user *next;
-       lstcon_rpc_ent_t *ent;
+       struct lstcon_rpc_ent *ent;
        struct srpc_generic_reply *rep;
        struct lstcon_rpc *crpc;
        struct srpc_msg *msg;
@@ -492,7 +492,7 @@ lstcon_rpc_trans_interpreter(struct lstcon_rpc_trans *trans,
 
                next = tmp.next;
 
-               ent = list_entry(next, lstcon_rpc_ent_t, rpe_link);
+               ent = list_entry(next, struct lstcon_rpc_ent, rpe_link);
 
                LASSERT(crpc->crp_stamp);
 

diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h b/drivers/staging/lustre/lnet/selftest/conrpc.h
index e629e87c461cb7ac3185b9644dfd16095d8b9d9d..ad0a49e2b462f702b45ab929bbd56530cb5f61de 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -103,7 +103,7 @@ struct lstcon_rpc_trans {
 
 typedef int (*lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
 typedef int (*lstcon_rpc_readent_func_t)(int, struct srpc_msg *,
-                                        lstcon_rpc_ent_t __user *);
+                                        struct lstcon_rpc_ent __user *);
 
 int  lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
                        unsigned int version, struct lstcon_rpc **crpc);

diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index bf4111afca08dd95c42e438a4072afa0b4edf304..b01023c83e18c213c6f06700c6c39f34073dfb03 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -368,7 +368,7 @@ lstcon_sesrpc_condition(int transop, struct lstcon_node *nd, void *arg)
 
 static int
 lstcon_sesrpc_readent(int transop, struct srpc_msg *msg,
-                     lstcon_rpc_ent_t __user *ent_up)
+                     struct lstcon_rpc_ent __user *ent_up)
 {
        struct srpc_debug_reply *rep;
 
@@ -1385,7 +1385,7 @@ lstcon_test_find(struct lstcon_batch *batch, int idx,
 
 static int
 lstcon_tsbrpc_readent(int transop, struct srpc_msg *msg,
-                     lstcon_rpc_ent_t __user *ent_up)
+                     struct lstcon_rpc_ent __user *ent_up)
 {
        struct srpc_batch_reply *rep = &msg->msg_body.bat_reply;
 
@@ -1464,7 +1464,7 @@ lstcon_test_batch_query(char *name, int testidx, int client,
 
 static int
 lstcon_statrpc_readent(int transop, struct srpc_msg *msg,
-                      lstcon_rpc_ent_t __user *ent_up)
+                      struct lstcon_rpc_ent __user *ent_up)
 {
        struct srpc_stat_reply *rep = &msg->msg_body.stat_reply;
        sfw_counters_t __user *sfwk_stat;