import 15.2.0 Octopus source

[ceph.git] / ceph / src / messages / MOSDPGUpdateLogMissing.h

diff --git a/ceph/src/messages/MOSDPGUpdateLogMissing.h b/ceph/src/messages/MOSDPGUpdateLogMissing.h
index cbf9485e9154f8fe8925d9a129b4a4ea4463754c..b661e414cef05b81f2f4254eabe766b0f7a53a59 100644 (file)
--- a/ceph/src/messages/MOSDPGUpdateLogMissing.h
+++ b/ceph/src/messages/MOSDPGUpdateLogMissing.h
@@ -18,14 +18,11 @@
 
 #include "MOSDFastDispatchOp.h"
 
-class MOSDPGUpdateLogMissing : public MessageInstance<MOSDPGUpdateLogMissing, MOSDFastDispatchOp> {
-public:
-  friend factory;
+class MOSDPGUpdateLogMissing : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 1;
 
-
 public:
   epoch_t map_epoch = 0, min_epoch = 0;
   spg_t pgid;
@@ -52,8 +49,8 @@ public:
   }
 
   MOSDPGUpdateLogMissing()
-    : MessageInstance(MSG_OSD_PG_UPDATE_LOG_MISSING, HEAD_VERSION,
-                        COMPAT_VERSION) { }
+    : MOSDFastDispatchOp{MSG_OSD_PG_UPDATE_LOG_MISSING, HEAD_VERSION,
+                        COMPAT_VERSION} {}
   MOSDPGUpdateLogMissing(
     const mempool::osd_pglog::list<pg_log_entry_t> &entries,
     spg_t pgid,
@@ -63,8 +60,8 @@ public:
     ceph_tid_t rep_tid,
     eversion_t pg_trim_to,
     eversion_t pg_roll_forward_to)
-    : MessageInstance(MSG_OSD_PG_UPDATE_LOG_MISSING, HEAD_VERSION,
-                        COMPAT_VERSION),
+    : MOSDFastDispatchOp{MSG_OSD_PG_UPDATE_LOG_MISSING, HEAD_VERSION,
+                        COMPAT_VERSION},
       map_epoch(epoch),
       min_epoch(min_epoch),
       pgid(pgid),
@@ -118,6 +115,9 @@ public:
       decode(pg_roll_forward_to, p);
     }
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif