From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 15 Dec 2022 16:13:33 +0000 (-0800)
Subject: Merge pull request #48416 from Rethan/wip-bluestore-discard-thread
X-Git-Tag: v18.1.0~639
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad6eb019f47244286b8ea8325ce43ddfc3508621;p=ceph.git

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>
---

ad6eb019f47244286b8ea8325ce43ddfc3508621
diff --cc src/blk/kernel/KernelDevice.cc
index 14b5b415385a,3ed42cb528c7..82d52085bef3
--- a/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);