From: Sage Weil <sage@redhat.com>
Date: Fri, 20 May 2016 19:25:39 +0000 (-0400)
Subject: os/bluestore: use bdev_block_size instead of min_alloc_size for allocators
X-Git-Tag: v11.0.0~359^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb45f389de5df81c72df502a778e833270503926;p=ceph.git

os/bluestore: use bdev_block_size instead of min_alloc_size for allocators

min_alloc_size is more dynamic; we just need the block size unit here.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BitMapAllocator.cc b/src/os/bluestore/BitMapAllocator.cc
index 846ba6bc249a..9b7ad9091bfd 100644
--- a/src/os/bluestore/BitMapAllocator.cc
+++ b/src/os/bluestore/BitMapAllocator.cc
@@ -24,7 +24,7 @@ BitMapAllocator::BitMapAllocator(int64_t device_size)
   : m_num_uncommitted(0),
     m_num_committing(0)
 {
-  int64_t block_size = g_conf->bluestore_min_alloc_size;
+  int64_t block_size = g_conf->bdev_block_size;
   int64_t zone_size_blks = 1024; // Change it later
 
   m_block_size = block_size;
diff --git a/src/os/bluestore/StupidAllocator.cc b/src/os/bluestore/StupidAllocator.cc
index 584c310da712..ae2cd0039da8 100644
--- a/src/os/bluestore/StupidAllocator.cc
+++ b/src/os/bluestore/StupidAllocator.cc
@@ -25,7 +25,7 @@ StupidAllocator::~StupidAllocator()
 
 unsigned StupidAllocator::_choose_bin(uint64_t orig_len)
 {
-  uint64_t len = orig_len / g_conf->bluestore_min_alloc_size;
+  uint64_t len = orig_len / g_conf->bdev_block_size;
   int bin = 0;
   while (len && bin + 1 < (int)free.size()) {
     len >>= 1;