From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 18 Feb 2017 20:47:25 +0000 (+0100)
Subject: crush: _bucket_is_in_use does not use cct
X-Git-Tag: v12.0.1~135^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d5124683b4aba8b4cdf8f33071061a1983c64e4;p=ceph.git

crush: _bucket_is_in_use does not use cct

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 196a44ccd7e..0cab66d28f4 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -218,7 +218,7 @@ bool CrushWrapper::_maybe_remove_last_instance(CephContext *cct, int item, bool
   if (_search_item_exists(item)) {
     return false;
   }
-  if (item < 0 && _bucket_is_in_use(cct, item)) {
+  if (item < 0 && _bucket_is_in_use(item)) {
     return false;
   }
 
@@ -253,7 +253,7 @@ int CrushWrapper::remove_item(CephContext *cct, int item, bool unlink_only)
 		    << " items, not empty" << dendl;
       return -ENOTEMPTY;
     }
-    if (_bucket_is_in_use(cct, item)) {
+    if (_bucket_is_in_use(item)) {
       return -EBUSY;
     }
   }
@@ -295,7 +295,7 @@ bool CrushWrapper::_search_item_exists(int item) const
   return false;
 }
 
-bool CrushWrapper::_bucket_is_in_use(CephContext *cct, int item)
+bool CrushWrapper::_bucket_is_in_use(int item)
 {
   for (unsigned i = 0; i < crush->max_rules; ++i) {
     crush_rule *r = crush->rules[i];
@@ -347,7 +347,7 @@ int CrushWrapper::remove_item_under(CephContext *cct, int item, int ancestor, bo
   ldout(cct, 5) << "remove_item_under " << item << " under " << ancestor
 		<< (unlink_only ? " unlink_only":"") << dendl;
 
-  if (!unlink_only && _bucket_is_in_use(cct, item)) {
+  if (!unlink_only && _bucket_is_in_use(item)) {
     return -EBUSY;
   }
 
diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index f31123f0b5a..f424b32f043 100644
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -683,7 +683,7 @@ public:
 private:
   bool _maybe_remove_last_instance(CephContext *cct, int id, bool unlink_only);
   int _remove_item_under(CephContext *cct, int id, int ancestor, bool unlink_only);
-  bool _bucket_is_in_use(CephContext *cct, int id);
+  bool _bucket_is_in_use(int id);
 public:
   int remove_item_under(CephContext *cct, int id, int ancestor, bool unlink_only);