From: Max Kellermann <max.kellermann@ionos.com>
Date: Fri, 25 Apr 2025 10:26:57 +0000 (+0200)
Subject: mds: add missing includes
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aec87cdb97edcf2c4081f5272f862df92fe031b2;p=ceph.git

mds: add missing includes

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

diff --git a/src/mds/Anchor.cc b/src/mds/Anchor.cc
index b0deda5623bb..47c0d892e64d 100644
--- a/src/mds/Anchor.cc
+++ b/src/mds/Anchor.cc
@@ -17,6 +17,8 @@
 #include "common/Formatter.h"
 #include "include/denc.h"
 
+#include <dirent.h> // for DT_DIR
+
 void Anchor::encode(bufferlist &bl) const
 {
   ENCODE_START(2, 1, bl);
diff --git a/src/mds/Anchor.h b/src/mds/Anchor.h
index f18c1aa4478e..e20a4d44c218 100644
--- a/src/mds/Anchor.h
+++ b/src/mds/Anchor.h
@@ -15,11 +15,17 @@
 #ifndef CEPH_ANCHOR_H
 #define CEPH_ANCHOR_H
 
+#include <iosfwd>
+#include <set>
 #include <string>
 
 #include "include/types.h"
 #include "mdstypes.h"
 #include "include/buffer.h"
+#include "include/cephfs/types.h" // for mds_rank_t
+#include "include/frag.h"
+#include "include/fs_types.h" // for inodeno_t
+#include "include/int_types.h" // for __u8
 
 /*
  * Anchor represents primary linkage of an inode. When adding inode to an
diff --git a/src/mds/BatchOp.h b/src/mds/BatchOp.h
index 5277c3d69f8d..6249dc0c6891 100644
--- a/src/mds/BatchOp.h
+++ b/src/mds/BatchOp.h
@@ -16,9 +16,11 @@
 #ifndef MDS_BATCHOP_H
 #define MDS_BATCHOP_H
 
-#include "common/ref.h"
+#include <iosfwd>
 
 #include "mdstypes.h"
+#include "common/ref.h"
+#include "include/cephfs/types.h" // for mds_rank_t
 
 class BatchOp {
 public:
diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index 0699a092ca3b..34123988e633 100644
--- a/src/mds/Beacon.cc
+++ b/src/mds/Beacon.cc
@@ -32,6 +32,8 @@
 #include "mds/mdstypes.h"
 #include "osdc/Objecter.h"
 
+#include "messages/MMDSBeacon.h"
+
 #include <chrono>
 
 #define dout_context g_ceph_context
diff --git a/src/mds/Capability.cc b/src/mds/Capability.cc
index 8e435f96ab92..624bf25f9f71 100644
--- a/src/mds/Capability.cc
+++ b/src/mds/Capability.cc
@@ -15,6 +15,7 @@
 #include "Capability.h"
 #include "BatchOp.h"
 #include "CInode.h"
+#include "Mutation.h" // for struct MDLockCache
 #include "SessionMap.h"
 
 #include "common/debug.h"
diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index 089438607b2f..a67479360967 100644
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -17,8 +17,12 @@
 #define CEPH_CAPABILITY_H
 
 #include "include/buffer_fwd.h"
+#include "include/ceph_fs.h" // for CEPH_CAP_*
 #include "include/counter.h"
 #include "include/mempool.h"
+#include "include/object.h" // for snapid_t
+#include "include/types.h" // for version_t
+#include "include/utime.h"
 #include "include/xlist.h"
 #include "include/elist.h"
 
diff --git a/src/mds/DamageTable.h b/src/mds/DamageTable.h
index 91c262739a4e..1a37c0b3d64d 100644
--- a/src/mds/DamageTable.h
+++ b/src/mds/DamageTable.h
@@ -18,10 +18,17 @@
 
 #include "mdstypes.h"
 
+#include <map>
 #include <memory>
 #include <string>
 #include <string_view>
 
+#include "include/cephfs/types.h" // for mds_rank_t
+#include "include/frag.h"
+#include "include/fs_types.h" // for inodeno_t
+#include "include/object.h" // for snapid_t
+#include "include/utime.h"
+
 class CDir;
 class CInode;
 
diff --git a/src/mds/FSMapUser.cc b/src/mds/FSMapUser.cc
index c23e2b65ee83..fea4a17cd2ec 100644
--- a/src/mds/FSMapUser.cc
+++ b/src/mds/FSMapUser.cc
@@ -1,4 +1,5 @@
 #include "FSMapUser.h"
+#include "common/Formatter.h"
 
 void FSMapUser::encode(ceph::buffer::list& bl, uint64_t features) const
 {
diff --git a/src/mds/FSMapUser.h b/src/mds/FSMapUser.h
index d435a311a0cb..4a6f5473f96f 100644
--- a/src/mds/FSMapUser.h
+++ b/src/mds/FSMapUser.h
@@ -15,11 +15,18 @@
 #define CEPH_FSMAPCOMPACT_H
 
 #include <map>
+#include <iosfwd>
 #include <string>
 #include <string_view>
 
 #include "mds/mdstypes.h"
 
+#include "include/encoding.h"
+#include "include/cephfs/types.h" // for fs_cluster_id_t
+#include "include/types.h" // for epoch_t
+
+namespace ceph { class Formatter; }
+
 class FSMapUser {
 public:
   struct fs_info_t {
diff --git a/src/mds/InoTable.h b/src/mds/InoTable.h
index 42f9d5f0bedc..49f404e1a2c4 100644
--- a/src/mds/InoTable.h
+++ b/src/mds/InoTable.h
@@ -17,6 +17,7 @@
 #define CEPH_INOTABLE_H
 
 #include "MDSTable.h"
+#include "include/fs_types.h" // for inodeno_t
 #include "include/interval_set.h"
 
 class MDSRank;
diff --git a/src/mds/JournalPointer.cc b/src/mds/JournalPointer.cc
index c4b9c0980739..17ae1d687331 100644
--- a/src/mds/JournalPointer.cc
+++ b/src/mds/JournalPointer.cc
@@ -14,6 +14,10 @@
 
 
 #include "mds/JournalPointer.h"
+
+#include <iomanip>
+#include <ostream>
+
 #include "mds/mdstypes.h"
 
 #include "common/debug.h"
diff --git a/src/mds/JournalPointer.h b/src/mds/JournalPointer.h
index d5f3ba87fca6..62a983f55259 100644
--- a/src/mds/JournalPointer.h
+++ b/src/mds/JournalPointer.h
@@ -16,6 +16,12 @@
 #ifndef JOURNAL_POINTER_H
 #define JOURNAL_POINTER_H
 
+#include <iosfwd>
+#include <list>
+#include <string>
+
+#include "common/Formatter.h"
+#include "include/fs_types.h" // for inodeno_t
 #include "include/encoding.h"
 #include "mdstypes.h"
 
diff --git a/src/mds/LogSegment.h b/src/mds/LogSegment.h
index 88f90f6acabf..b0655f1398da 100644
--- a/src/mds/LogSegment.h
+++ b/src/mds/LogSegment.h
@@ -18,7 +18,9 @@
 #include "include/elist.h"
 #include "include/interval_set.h"
 #include "include/Context.h"
-#include "mdstypes.h"
+#include "include/fs_types.h" // for inodeno_t
+#include "include/types.h" // for version_t
+#include "mdstypes.h" // for dirfrag_t, metareqid_t
 #include "CInode.h"
 #include "CDentry.h"
 #include "CDir.h"
diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index b5caf18c8683..e86c3a37c048 100644
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -14,8 +14,16 @@
 #ifndef CEPH_MDBALANCER_H
 #define CEPH_MDBALANCER_H
 
-#include "mdstypes.h"
+#include <cstdint>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "mdstypes.h" // for dirfrag_t, mds_load_t
 #include "include/types.h"
+#include "common/ceph_time.h" // for coarse_mono_time()
+#include "include/cephfs/types.h" // for mds_rank_t
 #include "common/Clock.h"
 #include "common/ref.h"
 
diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h
index 3599e2bf25a8..ec20a7cad673 100644
--- a/src/mds/MDLog.h
+++ b/src/mds/MDLog.h
@@ -41,6 +41,7 @@ enum {
   l_mdl_last,
 };
 
+#include "include/fs_types.h" // for inodeno_t
 #include "include/types.h"
 #include "include/Context.h"
 
@@ -53,8 +54,12 @@ enum {
 #include "mdstypes.h"
 #include "LogSegmentRef.h"
 
+#include <atomic>
 #include <list>
 #include <map>
+#include <set>
+#include <string>
+#include <vector>
 
 class Journaler;
 class JournalPointer;
diff --git a/src/mds/MDSCacheObject.h b/src/mds/MDSCacheObject.h
index 62f20349ae81..4482641ae74c 100644
--- a/src/mds/MDSCacheObject.h
+++ b/src/mds/MDSCacheObject.h
@@ -8,6 +8,7 @@
 #include "common/config.h"
 
 #include "include/ceph_assert.h"
+#include "include/cephfs/types.h" // for mds_rank_t
 #include "include/mempool.h"
 #include "include/types.h"
 
diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index f53169971910..a87c26b36c0e 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -27,6 +27,7 @@
 
 #include "include/types.h"
 #include "include/ceph_features.h"
+#include "include/cephfs/types.h" // for mds_gid_t, mds_rank_t, MAX_MDS
 #include "include/health.h"
 #include "include/CompatSet.h"
 #include "include/common_fwd.h"
@@ -35,7 +36,7 @@
 #include "common/ceph_releases.h"
 #include "common/config.h"
 
-#include "mds/mdstypes.h"
+#include "mds/mdstypes.h" // feature_bitset_t
 
 namespace ceph { class Formatter; }
 
diff --git a/src/mds/MDSPerfMetricTypes.h b/src/mds/MDSPerfMetricTypes.h
index 78b838c892d9..a5bc1733940c 100644
--- a/src/mds/MDSPerfMetricTypes.h
+++ b/src/mds/MDSPerfMetricTypes.h
@@ -6,6 +6,8 @@
 
 #include <ostream>
 
+#include "common/Formatter.h"
+#include "include/cephfs/types.h" // for mds_rank_t
 #include "include/denc.h"
 #include "include/utime.h"
 #include "mdstypes.h"
diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h
index bc7f5c962829..5a46f765dc92 100644
--- a/src/mds/MDSRank.h
+++ b/src/mds/MDSRank.h
@@ -21,6 +21,7 @@
 #include "common/admin_socket.h" // for asok_finisher
 #include "common/DecayCounter.h"
 #include "common/LogClient.h"
+#include "common/TrackedOp.h" // for class OpTracker
 
 #include "include/common_fwd.h"
 
@@ -36,9 +37,12 @@
 // benefit of those including this header and using MDSRank::logger
 #include "common/perf_counters.h"
 
+#include <boost/intrusive_ptr.hpp>
+
 class MDSContext;
 class MDSMetaRequest;
 class MMDSMap;
+typedef boost::intrusive_ptr<MDRequestImpl> MDRequestRef;
 
 namespace boost::asio { class io_context; }
 
diff --git a/src/mds/MDSTable.h b/src/mds/MDSTable.h
index 4c34b74d58eb..972b01a793fc 100644
--- a/src/mds/MDSTable.h
+++ b/src/mds/MDSTable.h
@@ -15,7 +15,8 @@
 #ifndef CEPH_MDSTABLE_H
 #define CEPH_MDSTABLE_H
 
-#include "include/buffer_fwd.h"
+#include "include/buffer.h"
+#include "include/object.h" // for object_t
 #include "include/types.h" // for version_t
 #include "include/cephfs/types.h" // for mds_rank_t
 
diff --git a/src/mds/MDSTableClient.h b/src/mds/MDSTableClient.h
index 22cd5d4b3ab0..a0879321f1e8 100644
--- a/src/mds/MDSTableClient.h
+++ b/src/mds/MDSTableClient.h
@@ -15,6 +15,7 @@
 #ifndef CEPH_MDSTABLECLIENT_H
 #define CEPH_MDSTABLECLIENT_H
 
+#include "include/buffer.h"
 #include "include/types.h"
 #include "mds_table_types.h"
 #include "mdstypes.h" // for mds_rank_t
@@ -30,6 +31,8 @@ class MMDSTableRequest;
 class MMDSTableQuery;
 class MDSRank;
 class LogSegment;
+using ceph::bufferlist;
+using ceph::cref_t;
 
 class MDSTableClient {
 public:
diff --git a/src/mds/MDSTableServer.h b/src/mds/MDSTableServer.h
index 8b6401fbd2aa..6d84374a152e 100644
--- a/src/mds/MDSTableServer.h
+++ b/src/mds/MDSTableServer.h
@@ -15,11 +15,17 @@
 #ifndef CEPH_MDSTABLESERVER_H
 #define CEPH_MDSTABLESERVER_H
 
+#include <map>
+#include <set>
+
 #include "MDSTable.h"
 #include "mdstypes.h" // for mds_table_pending_t
+#include "mds_table_types.h" // for get_mdstable_name()
 
 #include "messages/MMDSTableRequest.h"
 
+#include "common/ref.h" // for cref_t
+
 class MDSContext;
 
 class MDSTableServer : public MDSTable {
diff --git a/src/mds/Mantle.cc b/src/mds/Mantle.cc
index ed1a2c21bed9..ef2bb4aee20c 100644
--- a/src/mds/Mantle.cc
+++ b/src/mds/Mantle.cc
@@ -17,6 +17,7 @@
 #include "Mantle.h"
 #include "msg/Messenger.h"
 #include "common/Clock.h"
+#include "common/dout.h"
 #include "CInode.h"
 
 /* Note, by default debug_mds_balancer is 1/5. For debug messages 1<lvl<=5,
diff --git a/src/mds/Mantle.h b/src/mds/Mantle.h
index ffc1843a5e68..2456fb1ea3f2 100644
--- a/src/mds/Mantle.h
+++ b/src/mds/Mantle.h
@@ -24,6 +24,8 @@
 
 #include "mdstypes.h"
 
+#include "include/cephfs/types.h" // for mds_rank_t
+
 class Mantle {
   public:
     Mantle();
diff --git a/src/mds/MetricAggregator.h b/src/mds/MetricAggregator.h
index fddbfbc4add8..f619b3365fb6 100644
--- a/src/mds/MetricAggregator.h
+++ b/src/mds/MetricAggregator.h
@@ -7,14 +7,16 @@
 #include <map>
 #include <set>
 #include <thread>
+#include <unordered_set>
 
-#include "msg/msg_types.h"
+#include "msg/msg_types.h" // for entity_inst_t
 #include "msg/Dispatcher.h"
 #include "common/ceph_mutex.h"
 #include "common/perf_counters.h"
 #include "include/common_fwd.h"
 
-#include "mgr/MetricTypes.h"
+#include "mgr/Types.h" // for PerformanceCounters
+#include "mgr/MetricTypes.h" // for MetricPayload
 #include "mgr/MDSPerfMetricTypes.h"
 
 #include "mdstypes.h"
diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index 7f0e527be6dc..a7a84ff806ab 100644
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -23,12 +23,16 @@
 #include <unordered_map>
 #include <vector>
 
+#include "common/ref.h" // for cref_t
+#include "include/cephfs/types.h" // for mds_rank_t
+#include "include/Context.h"
 #include "include/interval_set.h"
 #include "include/elist.h"
 #include "include/filepath.h"
 
 #include "Capability.h"
 #include "LogSegmentRef.h"
+#include "mdstypes.h" // for dirfrag_t, metareqid_t
 
 #include "common/StackStringStream.h"
 #include "common/TrackedOp.h"
diff --git a/src/mds/OpenFileTable.h b/src/mds/OpenFileTable.h
index ae519df673e6..7f36168d7d76 100644
--- a/src/mds/OpenFileTable.h
+++ b/src/mds/OpenFileTable.h
@@ -15,7 +15,9 @@
 #ifndef OPEN_FILE_TABLE_H
 #define OPEN_FILE_TABLE_H
 
+#include <cstdint>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -23,7 +25,14 @@
 
 #include "common/config_proxy.h" // for class ConfigProxy
 #include "global/global_context.h" // for g_conf()
-
+#include "include/buffer_fwd.h"
+#include "include/cephfs/types.h" // for mds_rank_t"
+#include "include/frag.h"
+#include "include/fs_types.h" // for inodeno_t
+#include "include/object.h"
+#include "include/types.h" // for version_t
+
+namespace TOPNSPC::common { class PerfCounters; }
 struct inode_backpointer_t;
 class Context;
 class CDir;
@@ -155,7 +164,7 @@ protected:
   std::map<uint64_t, std::vector<inodeno_t> > logseg_destroyed_inos;
   std::set<inodeno_t> destroyed_inos_set;
 
-  std::unique_ptr<PerfCounters> logger;
+  std::unique_ptr<TOPNSPC::common::PerfCounters> logger;
 
   std::map<uint64_t, std::vector<Context*>> waiting_for_commit;
 };
diff --git a/src/mds/PurgeQueue.h b/src/mds/PurgeQueue.h
index 1ae6bff5134c..f01998aadeea 100644
--- a/src/mds/PurgeQueue.h
+++ b/src/mds/PurgeQueue.h
@@ -18,6 +18,7 @@
 #include "mds/mdstypes.h"
 #include "common/Finisher.h"
 #include "common/snap_types.h" // for class SnapContext
+#include "include/cephfs/types.h" // for mds_rank_t
 #include "osdc/Journaler.h"
 #include "include/frag.h"
 
diff --git a/src/mds/QuiesceDb.h b/src/mds/QuiesceDb.h
index 486d08a70685..711e9d5f2796 100644
--- a/src/mds/QuiesceDb.h
+++ b/src/mds/QuiesceDb.h
@@ -22,6 +22,7 @@
 
 #include "mds/mdstypes.h"
 #include "common/ceph_time.h"
+#include "include/cephfs/types.h" // for mds_gid_t
 
 class Context;
 
diff --git a/src/mds/QuiesceDbManager.h b/src/mds/QuiesceDbManager.h
index 596204f498ec..30ce1c876aba 100644
--- a/src/mds/QuiesceDbManager.h
+++ b/src/mds/QuiesceDbManager.h
@@ -23,6 +23,9 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include "include/cephfs/types.h" // for fs_cluster_id_t
+#include "include/types.h" // for epoch_t
+
 struct QuiesceClusterMembership {
   static const QuiesceInterface::PeerId INVALID_MEMBER;
 
diff --git a/src/mds/ScrubHeader.h b/src/mds/ScrubHeader.h
index 5f112387fec3..09952a784d72 100644
--- a/src/mds/ScrubHeader.h
+++ b/src/mds/ScrubHeader.h
@@ -19,6 +19,8 @@
 #include <memory>
 #include <string>
 #include <string_view>
+#include <unordered_map>
+#include <vector>
 
 #include "include/ceph_assert.h"
 
diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index 6723c3fffc6f..4d0ef2ab1645 100644
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -24,12 +24,15 @@
 #include <string>
 #include <unordered_map>
 
+#include "include/ceph_assert.h"
+#include "include/cephfs/types.h" // for mds_rank_t
 #include "include/Context.h"
 #include "include/xlist.h"
 #include "include/elist.h"
 #include "include/interval_set.h"
-#include "mdstypes.h"
+#include "mdstypes.h" // for metareqid_t, session_info_t
 #include "mds/MDSAuthCaps.h"
+#include "common/ceph_time.h" // for ceph::coarse_mono_{clock,time}
 #include "common/DecayCounter.h"
 
 #include "Mutation.h" // for struct MDRequestImpl
diff --git a/src/mds/SnapRealm.h b/src/mds/SnapRealm.h
index 5fa8fef593fd..02ff8cb4282d 100644
--- a/src/mds/SnapRealm.h
+++ b/src/mds/SnapRealm.h
@@ -15,6 +15,8 @@
 #ifndef CEPH_MDS_SNAPREALM_H
 #define CEPH_MDS_SNAPREALM_H
 
+#include <map>
+#include <set>
 #include <string_view>
 
 #include "Capability.h"
diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h
index d81d2e42f898..67f4be7842cc 100644
--- a/src/mds/SnapServer.h
+++ b/src/mds/SnapServer.h
@@ -15,8 +15,14 @@
 #ifndef CEPH_SNAPSERVER_H
 #define CEPH_SNAPSERVER_H
 
+#include <list>
+#include <map>
+#include <set>
+
 #include "MDSTableServer.h"
 #include "snap.h"
+#include "include/encoding.h"
+#include "include/object.h" // for struct snapid_t
 
 class MDSRank;
 class MRemoveSnaps;
diff --git a/src/mds/cephfs_features.cc b/src/mds/cephfs_features.cc
index f57f95fc8c8d..2506a119eb14 100644
--- a/src/mds/cephfs_features.cc
+++ b/src/mds/cephfs_features.cc
@@ -3,6 +3,7 @@
 
 #include "cephfs_features.h"
 #include "mdstypes.h"
+#include "common/Formatter.h"
 #include "common/StackStringStream.h"
 
 #include <fmt/format.h>
diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index 26f1d31c2979..18a81cec6f64 100644
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -3,6 +3,7 @@
 
 #include "mds/flock.h"
 #include "common/debug.h"
+#include "common/Formatter.h"
 #include "mdstypes.h"
 
 #include <iostream>
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 20578cd27bd7..3937c7506ffa 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -43,6 +43,8 @@
 #include "include/random.h" // for ceph::util::generate_random_number()
 #include "include/stringify.h"
 
+#include "messages/MMDSTableRequest.h"
+
 #include "LogSegment.h"
 
 #include "MDSRank.h"
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 37d7150ef0b1..056db3d7fea8 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -17,6 +17,8 @@
 #include "include/frag.h"
 #include "include/interval_set.h"
 #include "include/fs_types.h"
+#include "include/types.h" // for ceph_tid_t, version_t
+#include "include/utime.h"
 
 #include "include/ceph_assert.h"
 #include "include/cephfs/dump.h"
diff --git a/src/mds/snap.h b/src/mds/snap.h
index 621922e3d14a..539e20c68392 100644
--- a/src/mds/snap.h
+++ b/src/mds/snap.h
@@ -18,12 +18,15 @@
 #include <iosfwd>
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <string_view>
 
 #include "mdstypes.h"
 #include "common/snap_types.h"
 #include "include/buffer.h"
+#include "include/object.h" // for snapid_t
+#include "include/utime.h"
 
 namespace ceph { class Formatter; }