update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MExportDirPrepAck.h b/ceph/src/messages/MExportDirPrepAck.h
index 1792185e95b319cb7d4c152565173d1092eabd54..1d5456ac8fbb0e4710b618d00c4f121e2cd790d9 100644 (file)
--- a/ceph/src/messages/MExportDirPrepAck.h
+++ b/ceph/src/messages/MExportDirPrepAck.h
@@ -15,13 +15,13 @@
 #ifndef CEPH_MEXPORTDIRPREPACK_H
 #define CEPH_MEXPORTDIRPREPACK_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirPrepAck : public SafeMessage {
+class MExportDirPrepAck 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 = false;
@@ -31,17 +31,17 @@ private:
 
 protected:
   MExportDirPrepAck() :
-    SafeMessage{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirPrepAck(dirfrag_t df, bool s, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), success(s) {
+    MMDSOp{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), success(s) {
     set_tid(tid);
   }
-  ~MExportDirPrepAck() override {}
+  ~MExportDirPrepAck() final {}
 
 public:  
   bool is_success() const { return success; }
   std::string_view get_type_name() const override { return "ExPAck"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "export_prep_ack(" << dirfrag << (success ? " success)" : " fail)");
   }