From 177c47ac4058db2c530bd35e8c07b3861a7fd244 Mon Sep 17 00:00:00 2001 From: Wengang Wang Date: Tue, 10 Nov 2015 10:43:38 +0800 Subject: [PATCH] rds: remove the _reuse_ rds ib pool statistics Orabug: 22124214 fix a regress introduced by ceb99ba579a769f4e02375a3d52e36f44ae5f27f The above commit introduced the two new statistics to rds_ib_statistics. uint64_t s_ib_rdma_mr_1m_pool_reuse; uint64_t s_ib_rdma_mr_8k_pool_reuse; But didn't have rds-info changed accordingly thus rds-info gets shifted stats. this removes these two stats. Acked-by: Santosh Shilimkar Acked-by: Ajaykumar Hotchandani Signed-off-by: Wengang Wang --- net/rds/ib.h | 2 -- net/rds/ib_rdma.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/net/rds/ib.h b/net/rds/ib.h index bbbff80ee9af..1c24e3c33cf9 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h @@ -490,8 +490,6 @@ struct rds_ib_statistics { uint64_t s_ib_rdma_mr_1m_pool_flush; uint64_t s_ib_rdma_mr_1m_pool_wait; uint64_t s_ib_rdma_mr_1m_pool_depleted; - uint64_t s_ib_rdma_mr_1m_pool_reuse; - uint64_t s_ib_rdma_mr_8k_pool_reuse; uint64_t s_ib_atomic_cswp; uint64_t s_ib_atomic_fadd; uint64_t s_ib_srq_lows; diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c index 105a4e8a629d..d6dd17710f2d 100644 --- a/net/rds/ib_rdma.c +++ b/net/rds/ib_rdma.c @@ -320,10 +320,6 @@ static inline struct rds_ib_mr *rds_ib_reuse_fmr(struct rds_ib_mr_pool *pool) clear_bit(CLEAN_LIST_BUSY_BIT, flag); preempt_enable(); if (ibmr) { - if (pool->pool_type == RDS_IB_MR_8K_POOL) - rds_ib_stats_inc(s_ib_rdma_mr_8k_pool_reuse); - else - rds_ib_stats_inc(s_ib_rdma_mr_1m_pool_reuse); spin_lock_bh(&pool->busy_lock); list_add(&ibmr->pool_list, &pool->busy_list); spin_unlock_bh(&pool->busy_lock); -- 2.50.1