import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MExportDirDiscoverAck.h b/ceph/src/messages/MExportDirDiscoverAck.h
index ba8fda5653c447b9dde7f45d12081e80bdc76af0..e71e2898bd601c846b1297b625ed57b5379d92da 100644 (file)
--- a/ceph/src/messages/MExportDirDiscoverAck.h
+++ b/ceph/src/messages/MExportDirDiscoverAck.h
@@ -18,10 +18,11 @@
 #include "msg/Message.h"
 #include "include/types.h"
 
-class MExportDirDiscoverAck : public MessageInstance<MExportDirDiscoverAck> {
-public:
-  friend factory;
+class MExportDirDiscoverAck : public SafeMessage {
 private:
+  static const int HEAD_VERSION = 1;
+  static const int COMPAT_VERSION = 1;
+
   dirfrag_t dirfrag;
   bool success;
 
@@ -31,9 +32,9 @@ private:
   bool is_success() const { return success; }
 
 protected:
-  MExportDirDiscoverAck() : MessageInstance(MSG_MDS_EXPORTDIRDISCOVERACK) {}
+  MExportDirDiscoverAck() : SafeMessage{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirDiscoverAck(dirfrag_t df, uint64_t tid, bool s=true) :
-    MessageInstance(MSG_MDS_EXPORTDIRDISCOVERACK),
+    SafeMessage{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION},
     dirfrag(df), success(s) {
     set_tid(tid);
   }
@@ -59,6 +60,9 @@ public:
     encode(dirfrag, payload);
     encode(success, payload);
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif