staging: lustre: lnet: change lnet_counter_t to proper structure

Change lnet_counter_t from typedef to proper structure.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@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-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index 4ffe79c83e2276c4940195ee34b8597eb66f805c..4a1e0a1e4bdc6ae3b12641f155510e1b8f26a5de 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -603,7 +603,7 @@ bool lnet_delay_rule_match_locked(struct lnet_hdr *hdr, struct lnet_msg *msg);
 
 /** @} lnet_fault_simulation */
 
-void lnet_counters_get(lnet_counters_t *counters);
+void lnet_counters_get(struct lnet_counters *counters);
 void lnet_counters_reset(void);
 
 unsigned int lnet_iov_nob(unsigned int niov, struct kvec *iov);

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index ffc961f705cd7765c07d971c98a6c72878abceab..c98af93d0e84a9c046fd526363126d71471c5665 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -573,7 +573,7 @@ struct lnet {
        struct cfs_percpt_lock           *ln_net_lock;
        /* percpt message containers for active/finalizing/freed message */
        struct lnet_msg_container       **ln_msg_containers;
-       lnet_counters_t                 **ln_counters;
+       struct lnet_counters            **ln_counters;
        struct lnet_peer_table          **ln_peer_tables;
        /* failure simulation */
        struct list_head                  ln_test_peers;

diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h
index e81b0793ebdf33aa93b0c4c8498c2c9ff16296c1..d2af335808ddb07a5a2dec9b1b4038550a3fc9dc 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@@ -250,7 +250,7 @@ struct lnet_ping_info {
        struct lnet_ni_status   pi_ni[0];
 } WIRE_ATTR;
 
-typedef struct lnet_counters {
+struct lnet_counters {
        __u32   msgs_alloc;
        __u32   msgs_max;
        __u32   errors;
@@ -262,7 +262,7 @@ typedef struct lnet_counters {
        __u64   recv_length;
        __u64   route_length;
        __u64   drop_length;
-} WIRE_ATTR lnet_counters_t;
+} WIRE_ATTR;
 
 #define LNET_NI_STATUS_UP      0x15aac0de
 #define LNET_NI_STATUS_DOWN    0xdeadface

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 024b8e31a41d89a831fc7e255262da82dfa055ca..34b9b102749c6221cd8c8dd757a29e6f819c9db8 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -315,9 +315,9 @@ lnet_unregister_lnd(struct lnet_lnd *lnd)
 EXPORT_SYMBOL(lnet_unregister_lnd);
 
 void
-lnet_counters_get(lnet_counters_t *counters)
+lnet_counters_get(struct lnet_counters *counters)
 {
-       lnet_counters_t *ctr;
+       struct lnet_counters *ctr;
        int i;
 
        memset(counters, 0, sizeof(*counters));
@@ -344,13 +344,13 @@ EXPORT_SYMBOL(lnet_counters_get);
 void
 lnet_counters_reset(void)
 {
-       lnet_counters_t *counters;
+       struct lnet_counters *counters;
        int i;
 
        lnet_net_lock(LNET_LOCK_EX);
 
        cfs_percpt_for_each(counters, i, the_lnet.ln_counters)
-               memset(counters, 0, sizeof(lnet_counters_t));
+               memset(counters, 0, sizeof(struct lnet_counters));
 
        lnet_net_unlock(LNET_LOCK_EX);
 }
@@ -560,7 +560,7 @@ lnet_prepare(lnet_pid_t requested_pid)
        the_lnet.ln_interface_cookie = ktime_get_ns();
 
        the_lnet.ln_counters = cfs_percpt_alloc(lnet_cpt_table(),
-                                               sizeof(lnet_counters_t));
+                                               sizeof(struct lnet_counters));
        if (!the_lnet.ln_counters) {
                CERROR("Failed to allocate counters for LNet\n");
                rc = -ENOMEM;

diff --git a/drivers/staging/lustre/lnet/lnet/lib-msg.c b/drivers/staging/lustre/lnet/lnet/lib-msg.c
index 128c335338db6b317320d8b77f2228b2259ed6e4..4b5e3a8194456cb33b21ff56a0456aa3311c51ce 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lib-msg.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-msg.c
@@ -132,7 +132,7 @@ void
 lnet_msg_commit(struct lnet_msg *msg, int cpt)
 {
        struct lnet_msg_container *container = the_lnet.ln_msg_containers[cpt];
-       lnet_counters_t *counters  = the_lnet.ln_counters[cpt];
+       struct lnet_counters *counters  = the_lnet.ln_counters[cpt];
 
        /* routed message can be committed for both receiving and sending */
        LASSERT(!msg->msg_tx_committed);
@@ -164,7 +164,7 @@ lnet_msg_commit(struct lnet_msg *msg, int cpt)
 static void
 lnet_msg_decommit_tx(struct lnet_msg *msg, int status)
 {
-       lnet_counters_t *counters;
+       struct lnet_counters    *counters;
        lnet_event_t *ev = &msg->msg_ev;
 
        LASSERT(msg->msg_tx_committed);
@@ -216,7 +216,7 @@ lnet_msg_decommit_tx(struct lnet_msg *msg, int status)
 static void
 lnet_msg_decommit_rx(struct lnet_msg *msg, int status)
 {
-       lnet_counters_t *counters;
+       struct lnet_counters *counters;
        lnet_event_t *ev = &msg->msg_ev;
 
        LASSERT(!msg->msg_tx_committed); /* decommitted or never committed */

diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c
index 0065cc16555e247df546862880da85b0fe1cfdac..72b80c594108b88526ecfddad29f37b0e6628893 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/router_proc.c
+++ b/drivers/staging/lustre/lnet/lnet/router_proc.c
@@ -77,7 +77,7 @@ static int __proc_lnet_stats(void *data, int write,
                             loff_t pos, void __user *buffer, int nob)
 {
        int rc;
-       lnet_counters_t *ctrs;
+       struct lnet_counters *ctrs;
        int len;
        char *tmpstr;
        const int tmpsiz = 256; /* 7 %u and 4 %llu */

diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 4e7e5c862c643c6ff7dccd07f6635020b1d8eba2..358cae8515ed3413485f843afdd0c2485d0156fc 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -1469,14 +1469,14 @@ lstcon_statrpc_readent(int transop, struct srpc_msg *msg,
        struct srpc_stat_reply *rep = &msg->msg_body.stat_reply;
        struct sfw_counters __user *sfwk_stat;
        struct srpc_counters __user *srpc_stat;
-       lnet_counters_t __user *lnet_stat;
+       struct lnet_counters __user *lnet_stat;
 
        if (rep->str_status)
                return 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);
+       lnet_stat = (struct lnet_counters __user *)(srpc_stat + 1);
 
        if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) ||
            copy_to_user(srpc_stat, &rep->str_rpc, sizeof(*srpc_stat)) ||

diff --git a/drivers/staging/lustre/lnet/selftest/rpc.h b/drivers/staging/lustre/lnet/selftest/rpc.h
index 418c9c96abe694f347cfa13b6730bb10ea0d4d5c..a765537a79c41b32603bf1ceff6095c0579d28bd 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/rpc.h
+++ b/drivers/staging/lustre/lnet/selftest/rpc.h
@@ -163,7 +163,7 @@ struct srpc_stat_reply {
        struct lst_sid     str_sid;
        struct sfw_counters     str_fw;
        struct srpc_counters    str_rpc;
-       lnet_counters_t    str_lnet;
+       struct lnet_counters    str_lnet;
 } WIRE_ATTR;
 
 struct test_bulk_req {