From: Haomai Wang <haomaiwang@gmail.com>
Date: Mon, 24 Apr 2017 04:11:21 +0000 (+0800)
Subject: os/bluestore: align reclaim size to bluefs_alloc_size
X-Git-Tag: v12.0.3~262^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14744%2Fhead;p=ceph.git

os/bluestore: align reclaim size to bluefs_alloc_size

otherwise it will crash because of unaligned alloc size

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 6f35698d98a9..62c306ddedaf 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4437,7 +4437,7 @@ int BlueStore::_balance_bluefs_freespace(PExtentVector *extents)
   // reclaim from bluefs?
   if (reclaim) {
     // round up to alloc size
-    reclaim = P2ROUNDUP(reclaim, min_alloc_size);
+    reclaim = P2ROUNDUP(reclaim, cct->_conf->bluefs_alloc_size);
 
     // hard cap to fit into 32 bits
     reclaim = MIN(reclaim, 1ull<<31);