update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MExportDirDiscoverAck.h b/ceph/src/messages/MExportDirDiscoverAck.h
index e71e2898bd601c846b1297b625ed57b5379d92da..b33ed07a576348504ca7d6849b984364c7162a98 100644 (file)
--- a/ceph/src/messages/MExportDirDiscoverAck.h
+++ b/ceph/src/messages/MExportDirDiscoverAck.h
@@ -15,13 +15,13 @@
 #ifndef CEPH_MEXPORTDIRDISCOVERACK_H
 #define CEPH_MEXPORTDIRDISCOVERACK_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirDiscoverAck : public SafeMessage {
+class MExportDirDiscoverAck final : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t dirfrag;
   bool success;
@@ -32,17 +32,17 @@ private:
   bool is_success() const { return success; }
 
 protected:
-  MExportDirDiscoverAck() : SafeMessage{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION} {}
+  MExportDirDiscoverAck() : MMDSOp{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirDiscoverAck(dirfrag_t df, uint64_t tid, bool s=true) :
-    SafeMessage{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION},
     dirfrag(df), success(s) {
     set_tid(tid);
   }
-  ~MExportDirDiscoverAck() override {}
+  ~MExportDirDiscoverAck() final {}
 
 public:
   std::string_view get_type_name() const override { return "ExDisA"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "export_discover_ack(" << dirfrag;
     if (success) 
       o << " success)";
@@ -51,6 +51,7 @@ public:
   }
 
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(dirfrag, p);
     decode(success, p);