RDS: Move atomic stats from general to ib-specific area

Signed-off-by: Andy Grover <andy.grover@oracle.com>

diff --git a/net/rds/ib.h b/net/rds/ib.h
index 4c2ee2401979fa7a5894779962a07b9f87072009..c506604325d515aa9b58f0cefbc336ccf1e21ba7 100644 (file)
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -202,6 +202,8 @@ struct rds_ib_statistics {
        uint64_t        s_ib_rdma_mr_pool_flush;
        uint64_t        s_ib_rdma_mr_pool_wait;
        uint64_t        s_ib_rdma_mr_pool_depleted;
+       uint64_t        s_ib_atomic_cswp;
+       uint64_t        s_ib_atomic_fadd;
 };
 
 extern struct workqueue_struct *rds_ib_wq;

diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index 6461a152bd5b27332c6016761b25f19600246595..657037d96cbf7ec3228ff6105306827061e8dd99 100644 (file)
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -132,9 +132,9 @@ static void rds_ib_send_unmap_atomic(struct rds_ib_connection *ic,
                             wc_status, rds_atomic_send_complete);
 
        if (op->op_type == RDS_ATOMIC_TYPE_CSWP)
-               rds_stats_inc(s_atomic_cswp);
+               rds_ib_stats_inc(s_ib_atomic_cswp);
        else
-               rds_stats_inc(s_atomic_fadd);
+               rds_ib_stats_inc(s_ib_atomic_fadd);
 }
 
 /*

diff --git a/net/rds/ib_stats.c b/net/rds/ib_stats.c
index d2c904dd6fbcb9e1eeb275f84cc062a273bb98ec..2d5965d6e97c039517d219bfdad3f28f7437b1d7 100644 (file)
--- a/net/rds/ib_stats.c
+++ b/net/rds/ib_stats.c
@@ -67,6 +67,8 @@ static const char *const rds_ib_stat_names[] = {
        "ib_rdma_mr_pool_flush",
        "ib_rdma_mr_pool_wait",
        "ib_rdma_mr_pool_depleted",
+       "ib_atomic_cswp",
+       "ib_atomic_fadd",
 };
 
 unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter,

diff --git a/net/rds/rds.h b/net/rds/rds.h
index c3a668b9cc1467c40cf177636434cac6dbeaea06..2f19d49fac9c6bf86a76955fac52ecbef644fe87 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -566,8 +566,6 @@ struct rds_statistics {
        uint64_t        s_cong_update_received;
        uint64_t        s_cong_send_error;
        uint64_t        s_cong_send_blocked;
-       uint64_t        s_atomic_cswp;
-       uint64_t        s_atomic_fadd;
 };
 
 /* af_rds.c */

diff --git a/net/rds/stats.c b/net/rds/stats.c
index b77be8be33ba88aec6f56c1ccda4bfe713c3c7e1..344929a663e544adb23f00c73c4c0849cb8f7db3 100644 (file)
--- a/net/rds/stats.c
+++ b/net/rds/stats.c
@@ -75,8 +75,6 @@ static const char *const rds_stat_names[] = {
        "cong_update_received",
        "cong_send_error",
        "cong_send_blocked",
-       "s_atomic_cswp",
-       "s_atomic_fadd",
 };
 
 void rds_stats_info_copy(struct rds_info_iterator *iter,