Merge pull request #36626 from lixiaoy1/rbd_image_discard

librbd/rwl: discard cache

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/librbd/CMakeLists.txt
index 2f6931dbed30f15fd938372169e5dd1af0aa938f,eafbef9430f1b8afeee0e84f26edc7af764e3df9..53eb6853f3986f59e20453f1c0eb9959e4452670
--- 1/src/librbd/CMakeLists.txt
--- 2/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@@ -234,14 -221,13 +236,16 @@@ target_link_libraries(rbd_internal PRIV
    osdc rbd_types)
  target_include_directories(rbd_internal PRIVATE ${OPENSSL_INCLUDE_DIR})
  
 -if(WITH_RBD_RWL)
 +if(WITH_RBD_RWL OR WITH_RBD_SSD_CACHE)
    target_link_libraries(rbd_internal
      PUBLIC blk)
+   target_link_libraries(rbd_internal PRIVATE
+     StdFilesystem::filesystem)
  endif()
 -
 +if(WITH_RBD_RWL)
 +  target_link_libraries(rbd_types
 +    PUBLIC blk)
 +endif()
  add_custom_target(librbd_plugins)
  set(librbd_plugins_dir ${CEPH_INSTALL_PKGLIBDIR}/librbd)
  

diff --cc src/librbd/cache/pwl/InitRequest.cc
Simple merge