Merge pull request ceph#46295 from dparmar18/tracker3998

mds: split up mdstypes Reviewed-by: Venky Shankar <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Neeraj Pratap Singh <[email protected]> Reviewed-by: Greg Farnum <[email protected]> Reviewed-by: Xiubo Li <[email protected]> Reviewed-by: Nikhilkumar Shelke <[email protected]> Reviewed-by: Rishabh Dave <[email protected]>
mitsu-ko · Jun 20, 2022 · c34fd00 · c34fd00
2 parents 61673a7 + f2bfea5
commit c34fd00
Show file tree

Hide file tree

Showing 9 changed files with 964 additions and 912 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -2359,6 +2359,7 @@ fi
 %dir %{_includedir}/cephfs
 %{_includedir}/cephfs/libcephfs.h
 %{_includedir}/cephfs/ceph_ll_client.h
+%{_includedir}/cephfs/types.h
 %dir %{_includedir}/cephfs/metrics
 %{_includedir}/cephfs/metrics/Types.h
 %{_libdir}/libcephfs.so

diff --git a/debian/libcephfs-dev.install b/debian/libcephfs-dev.install
@@ -1,4 +1,5 @@
 usr/include/cephfs/ceph_ll_client.h
 usr/include/cephfs/libcephfs.h
+usr/include/cephfs/types.h
 usr/include/cephfs/metrics/Types.h
 usr/lib/libcephfs.so
diff --git a/src/client/Client.h b/src/client/Client.h
@@ -32,6 +32,7 @@
 #include "include/unordered_set.h"
 #include "include/cephfs/metrics/Types.h"
 #include "mds/mdstypes.h"
+#include "include/cephfs/types.h"
 #include "msg/Dispatcher.h"
 #include "msg/MessageRef.h"
 #include "msg/Messenger.h"

diff --git a/src/client/Inode.h b/src/client/Inode.h
@@ -13,6 +13,7 @@
 
 #include "mds/flock.h"
 #include "mds/mdstypes.h" // hrm
+#include "include/cephfs/types.h"
 
 #include "osdc/ObjectCacher.h"
 

diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
@@ -41,5 +41,6 @@ if(WITH_LIBCEPHFS)
   install(FILES
     cephfs/libcephfs.h
     cephfs/ceph_ll_client.h
+    cephfs/types.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cephfs)
 endif()