From c981115cc469b21b41f527ce00e3a41f180829ca Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 12 Dec 2019 16:26:42 +0100 Subject: [PATCH] common: move xattr -> os/filestore/os_xattr Aside from unittest_chain_xattr, these functions are only used by filestore, so it makes sense to move them out of common. Signed-off-by: David Disseldorp --- src/common/CMakeLists.txt | 3 +-- src/os/CMakeLists.txt | 1 + src/os/filestore/FileStore.cc | 1 - src/os/filestore/chain_xattr.h | 2 +- src/{common/xattr.c => os/filestore/os_xattr.c} | 2 +- src/{common/xattr.h => os/filestore/os_xattr.h} | 0 6 files changed, 4 insertions(+), 5 deletions(-) rename src/{common/xattr.c => os/filestore/os_xattr.c} (99%) rename src/{common/xattr.h => os/filestore/os_xattr.h} (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 46dab5362f25c..7affa6d5f6b88 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -98,8 +98,7 @@ set(common_srcs url_escape.cc utf8.c util.cc - version.cc - xattr.c) + version.cc) set_source_files_properties(${CMAKE_SOURCE_DIR}/src/common/version.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/src/include/ceph_ver.h) diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt index c9de652ee3e97..51894fd9a3c95 100644 --- a/src/os/CMakeLists.txt +++ b/src/os/CMakeLists.txt @@ -13,6 +13,7 @@ set(libos_srcs filestore/IndexManager.cc filestore/LFNIndex.cc filestore/WBThrottle.cc + filestore/os_xattr.c memstore/MemStore.cc kstore/KStore.cc kstore/kstore_types.cc diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc index 03346afba1925..d6aceafda1767 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -36,7 +36,6 @@ #include "include/linux_fiemap.h" -#include "common/xattr.h" #include "chain_xattr.h" #if defined(__APPLE__) || defined(__FreeBSD__) diff --git a/src/os/filestore/chain_xattr.h b/src/os/filestore/chain_xattr.h index a2d17fa64afce..99c1aedd429bc 100644 --- a/src/os/filestore/chain_xattr.h +++ b/src/os/filestore/chain_xattr.h @@ -7,7 +7,7 @@ #include "include/compat.h" #include #include -#include "common/xattr.h" +#include "os_xattr.h" #include "include/ceph_assert.h" #include "include/buffer_fwd.h" diff --git a/src/common/xattr.c b/src/os/filestore/os_xattr.c similarity index 99% rename from src/common/xattr.c rename to src/os/filestore/os_xattr.c index c7afcf1e1e002..8de0e1d921a61 100644 --- a/src/common/xattr.c +++ b/src/os/filestore/os_xattr.c @@ -26,7 +26,7 @@ #error "Your system is not supported!" #endif -#include "common/xattr.h" +#include "os_xattr.h" /* * Sets extended attribute on a file. diff --git a/src/common/xattr.h b/src/os/filestore/os_xattr.h similarity index 100% rename from src/common/xattr.h rename to src/os/filestore/os_xattr.h -- 2.39.5