Merge branch 'reef' into wip-70147-reef

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

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

diff --cc src/blk/kernel/KernelDevice.h
index c7d55d73edc9488144086e9ddf2469a5422ac727,e3ecaa036d0880dcc7ef2d0215a287d62050d263..13badbe2aef8fd6898fd750e26c371ad96b9647e
--- 1/src/blk/kernel/KernelDevice.h
--- 2/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;