From 0d3e862c262c86bf534d180794aa6a7e93c32d10 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 25 Jul 2018 16:20:08 +0800 Subject: [PATCH] iosd/osd_type: kill unused input ec_pool for iterate_mayberw_back_to Signed-off-by: xie xingguo --- src/osd/osd_types.cc | 1 - src/osd/osd_types.h | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index ec39aa9e5097..488f41fccdd3 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -3246,7 +3246,6 @@ public: })); } void iterate_mayberw_back_to( - bool ec_pool, epoch_t les, std::function &)> &&f) const override { for (auto i = intervals.rbegin(); i != intervals.rend(); ++i) { diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 1ade94a21a1e..ded4efcd772c 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -2672,7 +2672,6 @@ public: virtual void decode(bufferlist::const_iterator &bl) = 0; virtual void dump(Formatter *f) const = 0; virtual void iterate_mayberw_back_to( - bool ec_pool, epoch_t les, std::function &)> &&f) const = 0; @@ -2787,11 +2786,10 @@ public: template void iterate_mayberw_back_to( - bool ec_pool, epoch_t les, F &&f) const { assert(past_intervals); - past_intervals->iterate_mayberw_back_to(ec_pool, les, std::forward(f)); + past_intervals->iterate_mayberw_back_to(les, std::forward(f)); } void clear() { assert(past_intervals); @@ -3006,7 +3004,6 @@ PastIntervals::PriorSet::PriorSet( } past_intervals.iterate_mayberw_back_to( - ec_pool, last_epoch_started, [&](epoch_t start, const set &acting) { ldpp_dout(dpp, 10) << "build_prior maybe_rw interval:" << start -- 2.47.3