From 2c6aea1c167bf39afd06ff017340aaa033ffd1e2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 26 Nov 2018 15:49:51 +0800 Subject: [PATCH] tools/ceph-dencoder: conditionally link against mds ceph-dencoder should not link against libmds if WITH_CEPHFS is OFF. Signed-off-by: Kefu Chai --- src/tools/ceph-dencoder/CMakeLists.txt | 6 +++++- src/tools/ceph-dencoder/types.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tools/ceph-dencoder/CMakeLists.txt b/src/tools/ceph-dencoder/CMakeLists.txt index d500b5f59110..8ae397e6844d 100644 --- a/src/tools/ceph-dencoder/CMakeLists.txt +++ b/src/tools/ceph-dencoder/CMakeLists.txt @@ -36,11 +36,15 @@ if(WITH_RBD) endif() endif() +if(WITH_CEPHFS) + list(APPEND DENCODER_EXTRALIBS + mds) +endif() + target_link_libraries(ceph-dencoder global os osd - mds mon journal ${DENCODER_EXTRALIBS} diff --git a/src/tools/ceph-dencoder/types.h b/src/tools/ceph-dencoder/types.h index 8bff4e05251b..c609a27faac9 100644 --- a/src/tools/ceph-dencoder/types.h +++ b/src/tools/ceph-dencoder/types.h @@ -1,3 +1,5 @@ +#include "acconfig.h" + #include "ceph_time.h" TYPE(real_time_wrapper) TYPE(coarse_real_time_wrapper) @@ -204,6 +206,7 @@ TYPE(FSSuperblock) TYPE(kstore_cnode_t) TYPE(kstore_onode_t) +#ifdef WITH_CEPHFS #include "mds/JournalPointer.h" TYPE(JournalPointer) @@ -313,6 +316,7 @@ TYPE_FEATUREFUL_NOCOPY(ETableServer) #include "mds/events/EUpdate.h" TYPE_FEATUREFUL_NOCOPY(EUpdate) +#endif // WITH_CEPHFS #ifdef WITH_RBD #include "librbd/journal/Types.h" -- 2.47.3