From: Ilya Dryomov <idryomov@gmail.com>
Date: Sat, 14 Aug 2021 17:15:47 +0000 (+0200)
Subject: librbd/cache/pwl/ssd: ensure bdev and pool sizes match
X-Git-Tag: v16.2.7~50^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=059e192bdbe3753d495850cb78b552d694dbf714;p=ceph.git

librbd/cache/pwl/ssd: ensure bdev and pool sizes match

m_log_pool_size should be multiple of 1M but, just in case, prevent
is_valid_io() assert in KernelDevice::aio_write().

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 41b95ac987954dc2c29090926236660b8348e9d2)
---

diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc
index 39795084c9a6..ccdc3f665375 100644
--- a/src/librbd/cache/pwl/ssd/WriteLog.cc
+++ b/src/librbd/cache/pwl/ssd/WriteLog.cc
@@ -106,8 +106,7 @@ void WriteLog<I>::complete_read(
 }
 
 template <typename I>
-bool WriteLog<I>::initialize_pool(Context *on_finish,
-                                  pwl::DeferredContexts &later) {
+int WriteLog<I>::create_and_open_bdev() {
   CephContext *cct = m_image_ctx.cct;
 
   bdev = BlockDevice::create(cct, this->m_log_pool_name, aio_cache_cb,