From: Yite Gu <yitegu0@gmail.com>
Date: Mon, 17 Mar 2025 02:43:55 +0000 (+0800)
Subject: Merge branch 'reef' into wip-70147-reef
X-Git-Tag: testing/wip-pdonnell-testing-20250429.182310-reef-debug~22^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=85f74c4d74fffa23aaf7af2023cf993e08be7a4a;p=ceph-ci.git

Merge branch 'reef' into wip-70147-reef

Signed-off-by: Yite Gu <yitegu0@gmail.com>
---

85f74c4d74fffa23aaf7af2023cf993e08be7a4a
diff --cc src/blk/kernel/KernelDevice.h
index c7d55d73edc,e3ecaa036d0..13badbe2aef
--- a/src/blk/kernel/KernelDevice.h
+++ b/src/blk/kernel/KernelDevice.h
@@@ -52,8 -52,6 +52,7 @@@ private
    aio_callback_t discard_callback;
    void *discard_callback_priv;
    bool aio_stop;
-   bool discard_stop;
 +  bool need_notify = false;
  
    ceph::mutex discard_lock = ceph::make_mutex("KernelDevice::discard_lock");
    ceph::condition_variable discard_cond;