From: Kefu Chai <kchai@redhat.com>
Date: Mon, 20 Jun 2016 23:18:35 +0000 (+0800)
Subject: bluestore/BitAllocator: silence warnings of method hidden
X-Git-Tag: v11.0.0~100^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9834%2Fhead;p=ceph.git

bluestore/BitAllocator: silence warnings of method hidden

is_allocated(int64_t *blocks, int64_t num_blocks, int blk_off) only gets
called in BitMapAreaIN and its child classes. so it's safe to move this
method down to BitMapAreaIN.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/os/bluestore/BitAllocator.h b/src/os/bluestore/BitAllocator.h
index 9e59edfc415..ec3227caea5 100644
--- a/src/os/bluestore/BitAllocator.h
+++ b/src/os/bluestore/BitAllocator.h
@@ -191,10 +191,6 @@ public:
   bmap_area_type_t level_to_type(int level);
   static int get_level(int64_t total_blocks);
   virtual bool is_allocated(int64_t start_block, int64_t num_blocks) = 0;
-  virtual bool is_allocated(int64_t *blocks, int64_t num_blocks, int blk_off) {
-    debug_assert(0);
-    return true;
-  }
   virtual bool is_exhausted() = 0;
   virtual bool child_check_n_lock(BitMapArea *child, int64_t required) {
       debug_assert(0);
@@ -370,7 +366,7 @@ protected:
   BitMapAreaList *m_child_list;
 
   bool is_allocated(int64_t start_block, int64_t num_blocks);
-  bool is_allocated(int64_t *blocks, int64_t num_blocks, int64_t blk_off);
+  virtual bool is_allocated(int64_t *blocks, int64_t num_blocks, int64_t blk_off);
   virtual bool is_exhausted();
   virtual bool child_check_n_lock(BitMapArea *child, int64_t required);
   virtual void child_unlock(BitMapArea *child);