From f52d1ad23d97e1ab8c70f9b17b75daa0773698b7 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 25 Aug 2017 10:42:58 +0100 Subject: [PATCH] osd: s/crush_ruleset_in_use/crush_rule_in_use/ Signed-off-by: John Spray (cherry picked from commit 675483ecca06686fd4c626bfea33748092aef0c6) --- src/mon/OSDMonitor.cc | 2 +- src/osd/OSDMap.cc | 6 +++--- src/osd/OSDMap.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 80d1871ae0824..3644936f640a3 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -8822,7 +8822,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // FIXME: this is ok in some situations, but let's not bother with that // complexity now. int ruleset = newcrush.get_rule_mask_ruleset(ruleno); - if (osdmap.crush_ruleset_in_use(ruleset)) { + if (osdmap.crush_rule_in_use(ruleset)) { ss << "crush ruleset " << name << " " << ruleset << " is in use"; err = -EBUSY; goto reply; diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 59ba80106ca3b..e8b1d56676692 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -3284,10 +3284,10 @@ void OSDMap::print_oneline_summary(ostream& out) const out << " nearfull"; } -bool OSDMap::crush_ruleset_in_use(int ruleset) const +bool OSDMap::crush_rule_in_use(int rule_id) const { for (const auto &pool : pools) { - if (pool.second.crush_rule == ruleset) + if (pool.second.crush_rule == rule_id) return true; } return false; @@ -4010,7 +4010,7 @@ void OSDMap::get_pool_ids_by_osd(CephContext *cct, set rules; for (auto &i: raw_rules) { // exclude any dead rule - if (crush_ruleset_in_use(i)) { + if (crush_rule_in_use(i)) { rules.insert(i); } } diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 246bd407db135..65348d5d3a67b 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -1342,7 +1342,7 @@ public: const string& root, ostream *ss); - bool crush_ruleset_in_use(int ruleset) const; + bool crush_rule_in_use(int rule_id) const; void clear_temp() { pg_temp->clear(); -- 2.39.5