From: Jason Dillaman <dillaman@redhat.com>
Date: Sun, 1 Nov 2020 13:42:01 +0000 (-0500)
Subject: Merge pull request #36626 from lixiaoy1/rbd_image_discard
X-Git-Tag: v16.1.0~714
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fef5198b30f17d29af7c3dc2a06490a3470cfec;p=ceph.git

Merge pull request #36626 from lixiaoy1/rbd_image_discard

librbd/rwl: discard cache

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

6fef5198b30f17d29af7c3dc2a06490a3470cfec
diff --cc src/librbd/CMakeLists.txt
index 2f6931dbed30,eafbef9430f1..53eb6853f398
--- a/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)