staging: lustre: lnet: change srpc_counters_t to proper structure

Change srpc_counters_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 a9c5b6db06fcc65653129e1c638ccf4409f320ad..575d23a63f665b1373e379a7bfb760b4e2f6606a 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@@ -501,7 +501,7 @@ struct lst_test_ping_param {
        int     png_flags;      /* reserved flags */
 };
 
-typedef struct {
+struct srpc_counters {
        __u32 errors;
        __u32 rpcs_sent;
        __u32 rpcs_rcvd;
@@ -509,7 +509,7 @@ typedef struct {
        __u32 rpcs_expired;
        __u64 bulk_get;
        __u64 bulk_put;
-} WIRE_ATTR srpc_counters_t;
+} WIRE_ATTR;
 
 typedef struct {
        /** milliseconds since current session started */

diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index b01023c83e18c213c6f06700c6c39f34073dfb03..483a1bbd010e2876cce70bd33eb16265a273b9cf 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -1468,14 +1468,14 @@ lstcon_statrpc_readent(int transop, struct srpc_msg *msg,
 {
        struct srpc_stat_reply *rep = &msg->msg_body.stat_reply;
        sfw_counters_t __user *sfwk_stat;
-       srpc_counters_t __user *srpc_stat;
+       struct srpc_counters __user *srpc_stat;
        lnet_counters_t __user *lnet_stat;
 
        if (rep->str_status)
                return 0;
 
        sfwk_stat = (sfw_counters_t __user *)&ent_up->rpe_payload[0];
-       srpc_stat = (srpc_counters_t __user *)(sfwk_stat + 1);
+       srpc_stat = (struct srpc_counters __user *)(sfwk_stat + 1);
        lnet_stat = (lnet_counters_t __user *)(srpc_stat + 1);
 
        if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) ||

diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index ce9de8c9be57fa93c47820d4dc68869a10a9ccc3..92cd4113cf75e96b138157332c1549e7a2ed41a0 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -55,7 +55,7 @@ static struct smoketest_rpc {
        struct srpc_service     *rpc_services[SRPC_SERVICE_MAX_ID + 1];
        lnet_handle_eq_t rpc_lnet_eq;   /* _the_ LNet event queue */
        enum srpc_state  rpc_state;
-       srpc_counters_t  rpc_counters;
+       struct srpc_counters     rpc_counters;
        __u64            rpc_matchbits; /* matchbits counter */
 } srpc_data;
 
@@ -69,14 +69,14 @@ srpc_serv_portal(int svc_id)
 /* forward ref's */
 int srpc_handle_rpc(struct swi_workitem *wi);
 
-void srpc_get_counters(srpc_counters_t *cnt)
+void srpc_get_counters(struct srpc_counters *cnt)
 {
        spin_lock(&srpc_data.rpc_glock);
        *cnt = srpc_data.rpc_counters;
        spin_unlock(&srpc_data.rpc_glock);
 }
 
-void srpc_set_counters(const srpc_counters_t *cnt)
+void srpc_set_counters(const struct srpc_counters *cnt)
 {
        spin_lock(&srpc_data.rpc_glock);
        srpc_data.rpc_counters = *cnt;

diff --git a/drivers/staging/lustre/lnet/selftest/rpc.h b/drivers/staging/lustre/lnet/selftest/rpc.h
index f2987c599055321d7aed126aa2ee9554c2cdb37e..a5b44dbced50eb33f81793e3ddffb7186e06b147 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/rpc.h
+++ b/drivers/staging/lustre/lnet/selftest/rpc.h
@@ -162,7 +162,7 @@ struct srpc_stat_reply {
        __u32              str_status;
        struct lst_sid     str_sid;
        sfw_counters_t     str_fw;
-       srpc_counters_t    str_rpc;
+       struct srpc_counters    str_rpc;
        lnet_counters_t    str_lnet;
 } WIRE_ATTR;
 

diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
index 79b05aa5983567bf4f9f0c6d67ed05adbf851889..1e5526c8a20ff927c321493b5b3aa801f563f924 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -453,8 +453,8 @@ void srpc_abort_service(struct srpc_service *sv);
 int srpc_finish_service(struct srpc_service *sv);
 int srpc_service_add_buffers(struct srpc_service *sv, int nbuffer);
 void srpc_service_remove_buffers(struct srpc_service *sv, int nbuffer);
-void srpc_get_counters(srpc_counters_t *cnt);
-void srpc_set_counters(const srpc_counters_t *cnt);
+void srpc_get_counters(struct srpc_counters *cnt);
+void srpc_set_counters(const struct srpc_counters *cnt);
 
 extern struct cfs_wi_sched *lst_sched_serial;
 extern struct cfs_wi_sched **lst_sched_test;