update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MExportDirFinish.h b/ceph/src/messages/MExportDirFinish.h
index 579f34bd74fb51fa97f53b948270fc33456b7347..5cbf9ae292c3b4c72cf90ffff8529aaf3b9eaa3d 100644 (file)
--- a/ceph/src/messages/MExportDirFinish.h
+++ b/ceph/src/messages/MExportDirFinish.h
@@ -15,12 +15,12 @@
 #ifndef CEPH_MEXPORTDIRFINISH_H
 #define CEPH_MEXPORTDIRFINISH_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirFinish : public SafeMessage {
+class MExportDirFinish 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 last;
@@ -31,16 +31,16 @@ private:
   
 protected:
   MExportDirFinish() :
-    SafeMessage{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, last(false) {}
+    MMDSOp{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, last(false) {}
   MExportDirFinish(dirfrag_t df, bool l, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), last(l) {
+    MMDSOp{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), last(l) {
     set_tid(tid);
   }
-  ~MExportDirFinish() override {}
+  ~MExportDirFinish() final {}
 
 public:
   std::string_view get_type_name() const override { return "ExFin"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "export_finish(" << dirfrag << (last ? " last" : "") << ")";
   }
   
@@ -50,6 +50,7 @@ public:
     encode(last, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(dirfrag, p);
     decode(last, p);