mds/Mutation: forward-declare MClientRequest and MMDSPeerRequest

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

diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index 0628019807801a40c9a3138ce4077917c4c4ed5b..1e429f06d4b6c64fc233e663ec0025ef4c490d34 100644 (file)
--- a/src/mds/Mutation.cc
+++ b/src/mds/Mutation.cc
@@ -19,6 +19,8 @@
 #include "CDentry.h"
 #include "CInode.h"
 #include "CDir.h"
+#include "messages/MClientRequest.h"
+#include "messages/MMDSPeerRequest.h"
 
 using namespace std;
 
@@ -288,6 +290,15 @@ void MutationImpl::_dump_op_descriptor(ostream& stream) const
 
 // MDRequestImpl
 
+MDRequestImpl::Params::Params() = default;
+MDRequestImpl::Params::~Params() noexcept = default;
+
+MDRequestImpl::MDRequestImpl(const Params* params, OpTracker *tracker) :
+  MutationImpl(tracker, params->initiated,
+              params->reqid, params->attempt, params->peer_to),
+  item_session_request(this), client_request(params->client_req),
+  internal_op(params->internal_op) {}
+
 MDRequestImpl::~MDRequestImpl()
 {
   delete _more;

diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index a7a84ff806abfda1f45206edd15f959d3991380b..ebb563aa17eae9c127fcf486013b2376c5c64711 100644 (file)
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -36,8 +36,6 @@
 
 #include "common/StackStringStream.h"
 #include "common/TrackedOp.h"
-#include "messages/MClientRequest.h"
-#include "messages/MMDSPeerRequest.h"
 
 class LogSegment;
 class BatchOp;
@@ -51,6 +49,9 @@ class ScatterLock;
 class SimpleLock;
 struct sr_t;
 struct MDLockCache;
+class Message;
+class MClientRequest;
+class MMDSPeerRequest;
 
 struct MutationImpl : public TrackedOp {
 public:
@@ -365,7 +366,8 @@ struct MDRequestImpl : public MutationImpl {
   // ---------------------------------------------------
   struct Params {
     // keep these default values synced to MutationImpl's
-    Params() {}
+    Params();
+    ~Params() noexcept;
     const utime_t& get_recv_stamp() const {
       return initiated;
     }
@@ -391,11 +393,7 @@ struct MDRequestImpl : public MutationImpl {
     int internal_op = -1;
     bool continuous = false;
   };
-  MDRequestImpl(const Params* params, OpTracker *tracker) :
-    MutationImpl(tracker, params->initiated,
-                params->reqid, params->attempt, params->peer_to),
-    item_session_request(this), client_request(params->client_req),
-    internal_op(params->internal_op) {}
+  MDRequestImpl(const Params* params, OpTracker *tracker);
   ~MDRequestImpl() override;
   
   More* more();