From: Igor Fedotov <igor.fedotov@croit.io>
Date: Wed, 30 Jul 2025 11:25:42 +0000 (+0300)
Subject: Merge pull request #64351 from ifed01/wip-ifed-discard-threads-better-lifecycle
X-Git-Tag: v21.0.0~256^2~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e2fa0089d258cfb26014468bc92252068732d8a;p=ceph.git

Merge pull request #64351 from ifed01/wip-ifed-discard-threads-better-lifecycle

blk/kernel: improve DiscardThread life cycle.

Reviewed-by: Yite Gu <guyite@bytedance.com>
---

9e2fa0089d258cfb26014468bc92252068732d8a
diff --cc src/blk/kernel/KernelDevice.h
index 149b8b4aa413,f10458b4aff7..b444b645bc34
--- a/src/blk/kernel/KernelDevice.h
+++ b/src/blk/kernel/KernelDevice.h
@@@ -94,11 -94,9 +94,11 @@@ private
    virtual void  _pre_close() { }  // hook for child implementations
  
    void _aio_thread();
-   void _discard_thread(uint64_t tid);
+   void _discard_thread(DiscardThread* thr);
    bool _queue_discard(interval_set<uint64_t> &to_release);
 -  bool try_discard(interval_set<uint64_t> &to_release, bool async = true) override;
 +  bool try_discard(interval_set<uint64_t> &to_release,
 +                   bool async = true,
 +                   bool force = false) override;
  
    int _aio_start();
    void _aio_stop();