import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MExportCaps.h b/ceph/src/messages/MExportCaps.h
index 93e53b0f66683d3a06a3ffa5e3be6410e2346d6a..90f9864a5f83032dc8a0492325e1c924110c6afb 100644 (file)
--- a/ceph/src/messages/MExportCaps.h
+++ b/ceph/src/messages/MExportCaps.h
@@ -19,13 +19,12 @@
 #include "msg/Message.h"
 
 
-class MExportCaps : public MessageInstance<MExportCaps> {
-public:
-  friend factory;
+class MExportCaps : public SafeMessage {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
-public:
+
+public:  
   inodeno_t ino;
   bufferlist cap_bl;
   map<client_t,entity_inst_t> client_map;
@@ -33,7 +32,7 @@ public:
 
 protected:
   MExportCaps() :
-    MessageInstance(MSG_MDS_EXPORTCAPS, HEAD_VERSION, COMPAT_VERSION) {}
+    SafeMessage{MSG_MDS_EXPORTCAPS, HEAD_VERSION, COMPAT_VERSION} {}
   ~MExportCaps() override {}
 
 public:
@@ -57,7 +56,9 @@ public:
     if (header.version >= 2)
       decode(client_metadata_map, p);
   }
-
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif