Merge pull request #48416 from Rethan/wip-bluestore-discard-thread

blk/KernelDevice: don't start discard thread if device not support_di…

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

diff --cc src/blk/BlockDevice.h
Simple merge

diff --cc src/blk/kernel/KernelDevice.cc
index 14b5b415385adb6287160434bd4a1168da38e2ff,3ed42cb528c73986e8aa1d58f441956cff40b694..82d52085bef34b79a5e6f52944a0cd4214d15166
--- 1/src/blk/kernel/KernelDevice.cc
--- 2/src/blk/kernel/KernelDevice.cc
+++ b/src/blk/kernel/KernelDevice.cc
@@@ -307,10 -304,15 +309,12 @@@ void KernelDevice::close(
  {
    dout(1) << __func__ << dendl;
    _aio_stop();
-   _discard_stop();
+   if (discard_thread.is_started()) {
+     _discard_stop();
+   }
    _pre_close();
  
 -  if (vdo_fd >= 0) {
 -    VOID_TEMP_FAILURE_RETRY(::close(vdo_fd));
 -    vdo_fd = -1;
 -  }
 +  extblkdev::release_device(ebd_impl);
  
    for (int i = 0; i < WRITE_LIFE_MAX; i++) {
      assert(fd_directs[i] >= 0);

diff --cc src/blk/kernel/KernelDevice.h
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
Simple merge