staging: lustre: lnet: change sfw_counter_t to proper structure

Change sfw_counter_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 575d23a63f665b1373e379a7bfb760b4e2f6606a..c81c246ef2217266ad4ca377f8175e2e27fab0c6 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@@ -511,13 +511,13 @@ struct srpc_counters {
        __u64 bulk_put;
 } WIRE_ATTR;
 
-typedef struct {
+struct sfw_counters {
        /** milliseconds since current session started */
        __u32 running_ms;
        __u32 active_batches;
        __u32 zombie_sessions;
        __u32 brw_errors;
        __u32 ping_errors;
-} WIRE_ATTR sfw_counters_t;
+} WIRE_ATTR;
 
 #endif

diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 483a1bbd010e2876cce70bd33eb16265a273b9cf..4e7e5c862c643c6ff7dccd07f6635020b1d8eba2 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -1467,14 +1467,14 @@ lstcon_statrpc_readent(int transop, struct srpc_msg *msg,
                       struct lstcon_rpc_ent __user *ent_up)
 {
        struct srpc_stat_reply *rep = &msg->msg_body.stat_reply;
-       sfw_counters_t __user *sfwk_stat;
+       struct sfw_counters __user *sfwk_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];
+       sfwk_stat = (struct sfw_counters __user *)&ent_up->rpe_payload[0];
        srpc_stat = (struct srpc_counters __user *)(sfwk_stat + 1);
        lnet_stat = (lnet_counters_t __user *)(srpc_stat + 1);
 

diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index 5ca6712566650e18988bd6c95d6896766ba2c4a1..436aef37c5008a39b9e0796a463ed78d5da6d747 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -361,7 +361,7 @@ static int
 sfw_get_stats(struct srpc_stat_reqst *request, struct srpc_stat_reply *reply)
 {
        struct sfw_session *sn = sfw_data.fw_session;
-       sfw_counters_t *cnt = &reply->str_fw;
+       struct sfw_counters *cnt = &reply->str_fw;
        struct sfw_batch *bat;
 
        reply->str_sid = !sn ? LST_INVALID_SID : sn->sn_id;

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