update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MMDSOpenInoReply.h b/ceph/src/messages/MMDSOpenInoReply.h
index 37eae8285254ae3a2ec2a7d728a8eb2396f04d5a..a331b5f8b406607d76f8219fd64e2b175a30ace4 100644 (file)
--- a/ceph/src/messages/MMDSOpenInoReply.h
+++ b/ceph/src/messages/MMDSOpenInoReply.h
@@ -15,28 +15,28 @@
 #ifndef CEPH_MDSOPENINOREPLY_H
 #define CEPH_MDSOPENINOREPLY_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSOpenInoReply : public SafeMessage {
+class MMDSOpenInoReply final : public MMDSOp {
 public:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   inodeno_t ino;
-  vector<inode_backpointer_t> ancestors;
+  std::vector<inode_backpointer_t> ancestors;
   mds_rank_t hint;
   int32_t error;
 
 protected:
-  MMDSOpenInoReply() : SafeMessage{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, error(0) {}
+  MMDSOpenInoReply() : MMDSOp{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, error(0) {}
   MMDSOpenInoReply(ceph_tid_t t, inodeno_t i, mds_rank_t h=MDS_RANK_NONE, int e=0) :
-    SafeMessage{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, ino(i), hint(h), error(e) {
+    MMDSOp{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, ino(i), hint(h), error(e) {
     header.tid = t;
   }
 
 
 public:
   std::string_view get_type_name() const override { return "openinoreply"; }
-  void print(ostream &out) const override {
+  void print(std::ostream &out) const override {
     out << "openinoreply(" << header.tid << " "
        << ino << " " << hint << " " << ancestors << ")";
   }
@@ -49,6 +49,7 @@ public:
     encode(error, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(ino, p);
     decode(ancestors, p);