From: Andy Grover <andy.grover@oracle.com>
Date: Tue, 30 Mar 2010 00:47:30 +0000 (-0700)
Subject: RDS: Move atomic stats from general to ib-specific area
X-Git-Tag: MMI-PSA29.97-13-9~21994^2~499^2~57
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51e2cba8b5936c13b40f0fa11aa4e84683dbc751;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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 4c2ee2401979..c506604325d5 100644
--- 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 6461a152bd5b..657037d96cbf 100644
--- 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 d2c904dd6fbc..2d5965d6e97c 100644
--- 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 c3a668b9cc14..2f19d49fac9c 100644
--- 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 b77be8be33ba..344929a663e5 100644
--- 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,