mds/Server: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 6e106230bf9bd361fe61269e451df32d26f64c03..ebfade205822bd7b268bf6da4132413187ed818a 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -12,15 +12,19 @@
  *
  */
 
+#include "Server.h"
+#include "BatchOp.h"
+
 #include <boost/lexical_cast.hpp>
 #include "include/ceph_assert.h"  // lexical_cast includes system assert.h
+#include "include/cephfs/metrics/Types.h"
+#include "include/random.h" // for ceph::util::generate_random_number()
 
 #include <boost/config/warning_disable.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 
 #include "MDSRank.h"
-#include "Server.h"
 #include "Locker.h"
 #include "MDCache.h"
 #include "MDLog.h"
@@ -28,11 +32,20 @@
 #include "MDBalancer.h"
 #include "InoTable.h"
 #include "SnapClient.h"
+#include "SnapRealm.h"
 #include "Mutation.h"
 #include "MetricsHandler.h"
 #include "cephfs_features.h"
 #include "MDSContext.h"
 
+#include "messages/MClientReconnect.h"
+#include "messages/MClientReply.h"
+#include "messages/MClientRequest.h"
+#include "messages/MClientSession.h"
+#include "messages/MClientSnap.h"
+#include "messages/MClientReclaim.h"
+#include "messages/MClientReclaimReply.h"
+#include "messages/MLock.h"
 #include "msg/Messenger.h"
 
 #include "osdc/Objecter.h"
@@ -46,15 +59,14 @@
 
 #include "include/stringify.h"
 #include "include/filepath.h"
-#include "common/errno.h"
+#include "common/ceph_json.h"
+#include "common/debug.h"
 #include "common/Timer.h"
 #include "common/perf_counters.h"
 #include "include/compat.h"
 #include "osd/OSDMap.h"
 #include "fscrypt.h"
 
-#include <errno.h>
-
 #include <list>
 #include <regex>
 #include <string_view>

diff --git a/src/mds/Server.h b/src/mds/Server.h
index d3ec363b092fc79c401191f4aa6510fb39e86a29..cc59a53e155885faa7f15f43400528ca8c75a22e 100644 (file)
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -15,35 +15,54 @@
 #ifndef CEPH_MDS_SERVER_H
 #define CEPH_MDS_SERVER_H
 
-#include <string_view>
-
-using namespace std::literals::string_view_literals;
+#include "mds/mdstypes.h" // for xattr_map
 
 #include <common/DecayCounter.h>
+#include "common/ref.h" // for cref_t
 
 #include "include/common_fwd.h"
-
-#include "messages/MClientReconnect.h"
-#include "messages/MClientReply.h"
-#include "messages/MClientRequest.h"
-#include "messages/MClientSession.h"
-#include "messages/MClientSnap.h"
-#include "messages/MClientReclaim.h"
-#include "messages/MClientReclaimReply.h"
-#include "messages/MLock.h"
+#include "include/Context.h" // for C_GatherBase
 
 #include "CInode.h"
-#include "MDSRank.h"
 #include "Mutation.h"
-#include "MDSContext.h"
+
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
+#include <map>
+#include <memory>
+#include <set>
+#include <string_view>
+#include <vector>
+
+using namespace std::literals::string_view_literals;
 
 class OSDMap;
 class LogEvent;
 class EMetaBlob;
 class EUpdate;
+class LogSegment;
+class MDCache;
 class MDLog;
+class MDSContext;
+class MDSRank;
+class Session;
 struct SnapInfo;
+struct SnapRealm;
+class Message;
 class MetricsHandler;
+class MClientReconnect;
+class MClientReply;
+class MClientRequest;
+class MClientSession;
+class MClientSnap;
+class MClientReclaim;
+class MClientReclaimReply;
+class MLock;
+class MMDSPeerRequest;
 
 enum {
   l_mdss_first = 1000,