osd: s/crush_ruleset_in_use/crush_rule_in_use/

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c236f5397f9a221700b830d7243e182d18836f9e..a273dc3081b3f5f846c46734751fccf281636f8f 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -8365,7 +8365,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 9c3875b4fe99e45d9f068ae07a84283a652e3de0..228a21e318e5d37be504caab3c79382bded10cda 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3236,10 +3236,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;
@@ -3962,7 +3962,7 @@ void OSDMap::get_pool_ids_by_osd(CephContext *cct,
   set<int> 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 65350c22c624f15ba047895abff140e8f9b65bca..65f462859619afe68554f99ff5cffcbf74cd0519 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -1337,7 +1337,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();