From a14749bec0e0aea15193e1fcd1dccea8ec5c13b8 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Wed, 15 Jul 2020 22:11:12 +0800 Subject: [PATCH] blk: change configuration name to avoid miss hint "bluestore_ioring" has the hint that it only affect bluestore when it uses KernelDevice/HMSMRDevice driver. However, it also affects librbd when librbd use blk driver and "bluestore_ioring" is configured in global section. Refine the name to avoid this hint. Suggested-by: Kefu Chai Signed-off-by: Changcheng Liu --- src/blk/kernel/KernelDevice.cc | 2 +- src/blk/zoned/HMSMRDevice.cc | 2 +- src/common/options.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc index ddbed426a2da..a2d920d02144 100644 --- a/src/blk/kernel/KernelDevice.cc +++ b/src/blk/kernel/KernelDevice.cc @@ -66,7 +66,7 @@ KernelDevice::KernelDevice(CephContext* cct, aio_callback_t cb, void *cbpriv, ai fd_directs.resize(WRITE_LIFE_MAX, -1); fd_buffereds.resize(WRITE_LIFE_MAX, -1); - bool use_ioring = cct->_conf.get_val("bluestore_ioring"); + bool use_ioring = cct->_conf.get_val("bdev_ioring"); unsigned int iodepth = cct->_conf->bdev_aio_max_queue_depth; if (use_ioring && ioring_queue_t::supported()) { diff --git a/src/blk/zoned/HMSMRDevice.cc b/src/blk/zoned/HMSMRDevice.cc index a8b574f0562c..835097243164 100644 --- a/src/blk/zoned/HMSMRDevice.cc +++ b/src/blk/zoned/HMSMRDevice.cc @@ -60,7 +60,7 @@ HMSMRDevice::HMSMRDevice(CephContext* cct, aio_callback_t cb, void *cbpriv, aio_ fd_directs.resize(WRITE_LIFE_MAX, -1); fd_buffereds.resize(WRITE_LIFE_MAX, -1); - bool use_ioring = cct->_conf.get_val("bluestore_ioring"); + bool use_ioring = cct->_conf.get_val("bdev_ioring"); unsigned int iodepth = cct->_conf->bdev_aio_max_queue_depth; if (use_ioring && ioring_queue_t::supported()) { diff --git a/src/common/options.cc b/src/common/options.cc index 4605c6eb6f96..35cd4c3c0d56 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -4712,7 +4712,7 @@ std::vector