update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MExportCapsAck.h b/ceph/src/messages/MExportCapsAck.h
index 75ec3da37d715feb8f1e81b53afb535c8acb93fa..1ac62fdd4f53c3f4140d3265bf29eca65086c9c3 100644 (file)
--- a/ceph/src/messages/MExportCapsAck.h
+++ b/ceph/src/messages/MExportCapsAck.h
@@ -16,27 +16,26 @@
 #ifndef CEPH_MEXPORTCAPSACK_H
 #define CEPH_MEXPORTCAPSACK_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-
-class MExportCapsAck : public SafeMessage {
+class MExportCapsAck final : public MMDSOp {
  static constexpr int HEAD_VERSION = 1;
  static constexpr int COMPAT_VERSION = 1;
 
 public:  
   inodeno_t ino;
-  bufferlist cap_bl;
+  ceph::buffer::list cap_bl;
 
 protected:
   MExportCapsAck() :
-    SafeMessage{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportCapsAck(inodeno_t i) :
-    SafeMessage{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION}, ino(i) {}
-  ~MExportCapsAck() override {}
+    MMDSOp{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION}, ino(i) {}
+  ~MExportCapsAck() final {}
 
 public:
   std::string_view get_type_name() const override { return "export_caps_ack"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "export_caps_ack(" << ino << ")";
   }
 
@@ -46,6 +45,7 @@ public:
     encode(cap_bl, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(ino, p);
     decode(cap_bl, p);