Skip to content

Commit

Permalink
os/bluestore: remove cmake warning from extent alloc functions.
Browse files Browse the repository at this point in the history
tracker link: http://tracker.ceph.com/issues/16766
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
  • Loading branch information
chhabaramesh committed Jul 29, 2016
1 parent e7cfdc8 commit 5ea4f1a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/os/bluestore/Allocator.h
Expand Up @@ -43,7 +43,7 @@ class Allocator {
uint64_t max_alloc_size, int64_t hint,
std::vector<AllocExtent> *extents, int *count) = 0;

virtual int alloc_extents(uint64_t want_size, uint64_t alloc_unit,
int alloc_extents(uint64_t want_size, uint64_t alloc_unit,
int64_t hint, std::vector<AllocExtent> *extents,
int *count) {
return alloc_extents(want_size, alloc_unit, want_size, hint, extents, count);
Expand Down
8 changes: 4 additions & 4 deletions src/os/bluestore/BitAllocator.h
Expand Up @@ -194,10 +194,6 @@ class BitMapArea {
static int get_level(int64_t total_blocks);
static int64_t get_level_factor(int level);
virtual bool is_allocated(int64_t start_block, int64_t num_blocks) = 0;
virtual bool is_allocated(ExtentList *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);
Expand Down Expand Up @@ -322,6 +318,7 @@ class BitMapZone: public BitMapArea{
static int64_t total_blocks;
static void incr_count() { count++;}
static int64_t get_total_blocks() {return total_blocks;}

bool is_allocated(int64_t start_block, int64_t num_blocks);
bool is_exhausted();
void reset_marker();
Expand Down Expand Up @@ -364,6 +361,7 @@ class BitMapZone: public BitMapArea{
}

int64_t alloc_blocks(int64_t num_blocks, int64_t *start_block);
using BitMapArea::alloc_blocks_dis;
int64_t alloc_blocks_dis(int64_t num_blocks,
int64_t blk_off, ExtentList *block_list);
void set_blocks_used(int64_t start_block, int64_t num_blocks);
Expand All @@ -384,6 +382,8 @@ class BitMapAreaIN: public BitMapArea{
std::mutex m_blocks_lock;
BitMapAreaList *m_child_list;


using BitMapArea::is_allocated;
virtual bool is_allocated(int64_t start_block, int64_t num_blocks);
virtual bool is_exhausted();

Expand Down

0 comments on commit 5ea4f1a

Please sign in to comment.