From 6af489121bdbb45c173fbcf0da89a7aa759af3e6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 30 Mar 2017 14:01:05 -0400 Subject: [PATCH] mempool: do not skip first 2 mempools This broke when we sorted the pool definitions in the header. Signed-off-by: Sage Weil --- src/common/mempool.cc | 4 ++-- src/include/mempool.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/mempool.cc b/src/common/mempool.cc index 33ea7beb4d8..15643567b9b 100644 --- a/src/common/mempool.cc +++ b/src/common/mempool.cc @@ -39,9 +39,9 @@ const char *mempool::get_pool_name(mempool::pool_index_t ix) { return names[ix]; } -void mempool::dump(ceph::Formatter *f, size_t skip) +void mempool::dump(ceph::Formatter *f) { - for (size_t i = skip; i < num_pools; ++i) { + for (size_t i = 0; i < num_pools; ++i) { const pool_t &pool = mempool::get_pool((pool_index_t)i); f->open_object_section(get_pool_name((pool_index_t)i)); pool.dump(f); diff --git a/src/include/mempool.h b/src/include/mempool.h index 109da704c88..ab5086b5de0 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -249,8 +249,7 @@ public: void dump(ceph::Formatter *f) const; }; -// skip unittest_[12] by default -void dump(ceph::Formatter *f, size_t skip=2); +void dump(ceph::Formatter *f); // STL allocator for use with containers. All actual state -- 2.47.3