update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MExportDirAck.h b/ceph/src/messages/MExportDirAck.h
index f7b1beb9023799cc4696bd4950565b446c740f5d..ff8be81637f92dc4b44d6e80bead2132b98e711a 100644 (file)
--- a/ceph/src/messages/MExportDirAck.h
+++ b/ceph/src/messages/MExportDirAck.h
@@ -16,36 +16,40 @@
 #define CEPH_MEXPORTDIRACK_H
 
 #include "MExportDir.h"
+#include "msg/Message.h"
 
-class MExportDirAck : public Message {
+class MExportDirAck : public MessageInstance<MExportDirAck> {
 public:
+  friend factory;
+
   dirfrag_t dirfrag;
   bufferlist imported_caps;
 
-  dirfrag_t get_dirfrag() { return dirfrag; }
+  dirfrag_t get_dirfrag() const { return dirfrag; }
   
-  MExportDirAck() : Message(MSG_MDS_EXPORTDIRACK) {}
+protected:
+  MExportDirAck() : MessageInstance(MSG_MDS_EXPORTDIRACK) {}
   MExportDirAck(dirfrag_t df, uint64_t tid) :
-    Message(MSG_MDS_EXPORTDIRACK), dirfrag(df) {
+    MessageInstance(MSG_MDS_EXPORTDIRACK), dirfrag(df) {
     set_tid(tid);
   }
-private:
   ~MExportDirAck() override {}
 
 public:
-  const char *get_type_name() const override { return "ExAck"; }
+  std::string_view get_type_name() const override { return "ExAck"; }
     void print(ostream& o) const override {
     o << "export_ack(" << dirfrag << ")";
   }
 
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
-    ::decode(dirfrag, p);
-    ::decode(imported_caps, p);
+    auto p = payload.cbegin();
+    decode(dirfrag, p);
+    decode(imported_caps, p);
   }
   void encode_payload(uint64_t features) override {
-    ::encode(dirfrag, payload);
-    ::encode(imported_caps, payload);
+    using ceph::encode;
+    encode(dirfrag, payload);
+    encode(imported_caps, payload);
   }
 
 };