mds/MDCache: include cleanup

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 56e0b8026a28ef3bdcc130d2566cd576a4f232fd..4676355afd42e88e4a2c0fabbe8ade90faa8251d 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12,14 +12,18 @@
  * 
  */
 
+#include "MDCache.h"
+
 #include <errno.h>
+
+#include <deque>
 #include <ostream>
 #include <string>
 #include <string_view>
 #include <map>
 #include <memory>
+#include <queue>
 
-#include "MDCache.h"
 #include "MDSRank.h"
 #include "Server.h"
 #include "Locker.h"
@@ -27,8 +31,10 @@
 #include "MDBalancer.h"
 #include "Migrator.h"
 #include "ScrubStack.h"
+#include "BatchOp.h"
 
 #include "SnapClient.h"
+#include "SnapRealm.h"
 
 #include "MDSMap.h"
 
@@ -41,18 +47,43 @@
 #include "include/filepath.h"
 #include "include/util.h"
 
+#include "messages/MCacheExpire.h"
 #include "messages/MClientCaps.h"
+#include "messages/MClientQuota.h"
+#include "messages/MClientRequest.h"
+#include "messages/MClientSnap.h"
+#include "messages/MDentryLink.h"
+#include "messages/MDentryUnlink.h"
+#include "messages/MDirUpdate.h"
+#include "messages/MDiscover.h"
+#include "messages/MDiscoverReply.h"
+#include "messages/MGatherCaps.h"
+#include "messages/MMDSCacheRejoin.h"
+#include "messages/MMDSFindIno.h"
+#include "messages/MMDSFindInoReply.h"
+#include "messages/MMDSFragmentNotify.h"
+#include "messages/MMDSFragmentNotifyAck.h"
+#include "messages/MMDSOpenIno.h"
+#include "messages/MMDSOpenInoReply.h"
+#include "messages/MMDSPeerRequest.h"
+#include "messages/MMDSResolve.h"
+#include "messages/MMDSResolveAck.h"
+#include "messages/MMDSSnapUpdate.h"
 
 #include "msg/Message.h"
 #include "msg/Messenger.h"
 
+#include "common/debug.h"
 #include "common/errno.h"
 #include "common/perf_counters.h"
 #include "common/safe_io.h"
 
 #include "osdc/Journaler.h"
 #include "osdc/Filer.h"
+#include "osdc/Objecter.h"
+#include "osdc/Striper.h"
 
+#include "events/EMetaBlob.h"
 #include "events/ESubtreeMap.h"
 #include "events/ELid.h"
 #include "events/EUpdate.h"

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 3afea03e7c1a68705575102aeb7fce249c9787ec..beb5e0c58b70aa527e33b88669552d418af76d04 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -28,45 +28,38 @@
 #include "include/elist.h"
 #include "include/rados/rados_types.hpp"
 
-#include "messages/MCacheExpire.h"
-#include "messages/MClientQuota.h"
-#include "messages/MClientRequest.h"
-#include "messages/MClientSnap.h"
-#include "messages/MDentryLink.h"
-#include "messages/MDentryUnlink.h"
-#include "messages/MDirUpdate.h"
-#include "messages/MDiscover.h"
-#include "messages/MDiscoverReply.h"
-#include "messages/MGatherCaps.h"
-#include "messages/MGenericMessage.h"
-#include "messages/MInodeFileCaps.h"
-#include "messages/MLock.h"
-#include "messages/MMDSCacheRejoin.h"
-#include "messages/MMDSFindIno.h"
-#include "messages/MMDSFindInoReply.h"
-#include "messages/MMDSFragmentNotify.h"
-#include "messages/MMDSFragmentNotifyAck.h"
-#include "messages/MMDSOpenIno.h"
-#include "messages/MMDSOpenInoReply.h"
-#include "messages/MMDSResolve.h"
-#include "messages/MMDSResolveAck.h"
-#include "messages/MMDSPeerRequest.h"
-#include "messages/MMDSSnapUpdate.h"
-
 #include "osdc/Filer.h"
 #include "CInode.h"
 #include "CDentry.h"
 #include "CDir.h"
 #include "include/Context.h"
-#include "events/EMetaBlob.h"
 #include "RecoveryQueue.h"
 #include "StrayManager.h"
 #include "OpenFileTable.h"
 #include "MDSContext.h"
-#include "MDSMap.h"
 #include "Mutation.h"
 
+class EMetaBlob;
+class MCacheExpire;
+class MClientRequest;
+class MClientSnap;
+class MDentryLink;
+class MDentryUnlink;
+class MDirUpdate;
+class MDiscover;
+class MDiscoverReply;
+class MDSMap;
 class MDSRank;
+class MMDSCacheRejoin;
+class MMDSFindIno;
+class MMDSFindInoReply;
+class MMDSFragmentNotify;
+class MMDSFragmentNotifyAck;
+class MMDSOpenIno;
+class MMDSOpenInoReply;
+class MMDSResolve;
+class MMDSResolveAck;
+class MMDSSnapUpdate;
 class Session;
 class Migrator;