mempool: do not skip first 2 mempools

This broke when we sorted the pool definitions in the header.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/mempool.cc b/src/common/mempool.cc
index 33ea7beb4d8e798474c8470a4cee41b1399410c4..15643567b9b2e0541b5f36d1eb4352a14a8abdbd 100644 (file)
--- 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 109da704c88e4f5af86626af77d818028d053b4c..ab5086b5de0f861710dfab82578c060c3a99b3ee 100644 (file)
--- 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