From 9d4e680c65f1728167db1378f31eac208025c86c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Mon, 7 Oct 2024 08:30:35 +0200
Subject: [PATCH] mds/OpenFileTable: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/mds/OpenFileTable.cc | 13 ++++++++++++-
 src/mds/OpenFileTable.h  | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/mds/OpenFileTable.cc b/src/mds/OpenFileTable.cc
index 06c593cca3b..0120e1b5a58 100644
--- a/src/mds/OpenFileTable.cc
+++ b/src/mds/OpenFileTable.cc
@@ -12,15 +12,18 @@
  *
  */
 
+#include "OpenFileTable.h"
 #include "acconfig.h"
+#include "mds/Anchor.h"
 #include "mds/CInode.h"
 #include "mds/CDir.h"
+#include "mds/inode_backtrace.h" // for inode_backpointer_t
 #include "mds/MDSRank.h"
 #include "mds/MDCache.h"
 #include "osdc/Objecter.h"
-#include "OpenFileTable.h"
 
 #include "common/config.h"
+#include "common/debug.h"
 #include "common/errno.h"
 
 enum {
@@ -241,6 +244,14 @@ object_t OpenFileTable::get_object_name(unsigned idx) const
   return object_t(s);
 }
 
+void OpenFileTable::_reset_states() {
+  omap_num_objs = 0;
+  omap_num_items.resize(0);
+  journal_state = JOURNAL_NONE;
+  loaded_journals.clear();
+  loaded_anchor_map.clear();
+}
+
 void OpenFileTable::_encode_header(bufferlist &bl, int j_state)
 {
   std::string_view magic = CEPH_FS_ONDISK_MAGIC;
diff --git a/src/mds/OpenFileTable.h b/src/mds/OpenFileTable.h
index a1b62012f79..703934fdbf2 100644
--- a/src/mds/OpenFileTable.h
+++ b/src/mds/OpenFileTable.h
@@ -15,14 +15,24 @@
 #ifndef OPEN_FILE_TABLE_H
 #define OPEN_FILE_TABLE_H
 
+#include <map>
+#include <string>
+#include <vector>
+
 #include "mdstypes.h"
-#include "Anchor.h"
 
 #include "MDSContext.h"
 
+#include "common/config_proxy.h" // for class ConfigProxy
+#include "global/global_context.h" // for g_conf()
+
+struct inode_backpointer_t;
 class CDir;
 class CInode;
 class MDSRank;
+class Anchor;
+class OpenedAnchor;
+class RecoveredAnchor;
 
 struct ObjectOperation;
 
@@ -90,13 +100,7 @@ protected:
 
   object_t get_object_name(unsigned idx) const;
 
-  void _reset_states() {
-    omap_num_objs = 0;
-    omap_num_items.resize(0);
-    journal_state = JOURNAL_NONE;
-    loaded_journals.clear();
-    loaded_anchor_map.clear();
-  }
+  void _reset_states();
   void _read_omap_values(const std::string& key, unsigned idx, bool first);
   void _load_finish(int op_r, int header_r, int values_r,
 		    unsigned idx, bool first, bool more,
-- 
2.39.5