import ceph quincy 17.2.6

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

diff --git a/ceph/src/messages/MClientCaps.h b/ceph/src/messages/MClientCaps.h
index fa069f1889431fec7300d9adc66dbb996d3b1aff..77e8db1d0992bd201b693dab77e9ae2b531bbc24 100644 (file)
--- a/ceph/src/messages/MClientCaps.h
+++ b/ceph/src/messages/MClientCaps.h
@@ -19,9 +19,7 @@
 #include "mds/mdstypes.h"
 #include "include/ceph_features.h"
 
-class MClientCaps : public MessageInstance<MClientCaps> {
-public:
-  friend factory;
+class MClientCaps final : public SafeMessage {
 private:
 
   static constexpr int HEAD_VERSION = 11;
@@ -46,11 +44,11 @@ private:
 
   struct ceph_mds_cap_peer peer;
 
-  bufferlist snapbl;
-  bufferlist xattrbl;
-  bufferlist flockbl;
+  ceph::buffer::list snapbl;
+  ceph::buffer::list xattrbl;
+  ceph::buffer::list flockbl;
   version_t  inline_version = 0;
-  bufferlist inline_data;
+  ceph::buffer::list inline_data;
 
   // Receivers may not use their new caps until they have this OSD map
   epoch_t osd_epoch_barrier = 0;
@@ -131,7 +129,7 @@ private:
 
 protected:
   MClientCaps()
-    : MessageInstance(CEPH_MSG_CLIENT_CAPS, HEAD_VERSION, COMPAT_VERSION) {}
+    : SafeMessage{CEPH_MSG_CLIENT_CAPS, HEAD_VERSION, COMPAT_VERSION} {}
   MClientCaps(int op,
              inodeno_t ino,
              inodeno_t realm,
@@ -142,7 +140,7 @@ protected:
              int dirty,
              int mseq,
               epoch_t oeb)
-    : MessageInstance(CEPH_MSG_CLIENT_CAPS, HEAD_VERSION, COMPAT_VERSION),
+    : SafeMessage{CEPH_MSG_CLIENT_CAPS, HEAD_VERSION, COMPAT_VERSION},
       osd_epoch_barrier(oeb) {
     memset(&head, 0, sizeof(head));
     head.op = op;
@@ -159,7 +157,7 @@ protected:
   MClientCaps(int op,
              inodeno_t ino, inodeno_t realm,
              uint64_t id, int mseq, epoch_t oeb)
-    : MessageInstance(CEPH_MSG_CLIENT_CAPS, HEAD_VERSION, COMPAT_VERSION),
+    : SafeMessage{CEPH_MSG_CLIENT_CAPS, HEAD_VERSION, COMPAT_VERSION},
       osd_epoch_barrier(oeb) {
     memset(&head, 0, sizeof(head));
     head.op = op;
@@ -169,14 +167,14 @@ protected:
     head.migrate_seq = mseq;
     memset(&peer, 0, sizeof(peer));
   }
-  ~MClientCaps() override {}
+  ~MClientCaps() final {}
 
 private:
   file_layout_t layout;
 
 public:
   std::string_view get_type_name() const override { return "Cfcap";}
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "client_caps(" << ceph_cap_op_name(head.op)
        << " ino " << inodeno_t(head.ino)
        << " " << head.cap_id
@@ -193,7 +191,9 @@ public:
     out << " size " << size << "/" << max_size;
     if (truncate_seq)
       out << " ts " << truncate_seq << "/" << truncate_size;
-    out << " mtime " << mtime;
+    out << " mtime " << mtime
+        << " ctime " << ctime
+        << " change_attr " << change_attr;
     if (time_warp_seq)
       out << " tws " << time_warp_seq;
 
@@ -202,15 +202,20 @@ public:
 
     out << ")";
   }
-  
+
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(head, p);
-    ceph_mds_caps_body_legacy body;
-    decode(body, p);
     if (head.op == CEPH_CAP_OP_EXPORT) {
+      ceph_mds_caps_export_body body;
+      decode(body, p);
       peer = body.peer;
+      p += (sizeof(ceph_mds_caps_non_export_body) -
+           sizeof(ceph_mds_caps_export_body));
     } else {
+      ceph_mds_caps_non_export_body body;
+      decode(body, p);
       size = body.size;
       max_size = body.max_size;
       truncate_size = body.truncate_size;
@@ -221,7 +226,7 @@ public:
       layout.from_legacy(body.layout);
       time_warp_seq = body.time_warp_seq;
     }
-    decode_nohead(head.snap_trace_len, snapbl, p);
+    ceph::decode_nohead(head.snap_trace_len, snapbl, p);
 
     ceph_assert(middle.length() == head.xattr_len);
     if (head.xattr_len)
@@ -275,11 +280,16 @@ public:
     head.xattr_len = xattrbl.length();
 
     encode(head, payload);
-    ceph_mds_caps_body_legacy body;
+    static_assert(sizeof(ceph_mds_caps_non_export_body) >
+                 sizeof(ceph_mds_caps_export_body));
     if (head.op == CEPH_CAP_OP_EXPORT) {
-      memset(&body, 0, sizeof(body));
+      ceph_mds_caps_export_body body;
       body.peer = peer;
+      encode(body, payload);
+      payload.append_zero(sizeof(ceph_mds_caps_non_export_body) -
+                         sizeof(ceph_mds_caps_export_body));
     } else {
+      ceph_mds_caps_non_export_body body;
       body.size = size;
       body.max_size = max_size;
       body.truncate_size = truncate_size;
@@ -289,9 +299,9 @@ public:
       ctime.encode_timeval(&body.ctime);
       layout.to_legacy(&body.layout);
       body.time_warp_seq = time_warp_seq;
+      encode(body, payload);
     }
-    encode(body, payload);
-    encode_nohead(snapbl, payload);
+    ceph::encode_nohead(snapbl, payload);
 
     middle = xattrbl;
 
@@ -316,7 +326,7 @@ public:
       encode(inline_data, payload);
     } else {
       encode(inline_version, payload);
-      encode(bufferlist(), payload);
+      encode(ceph::buffer::list(), payload);
     }
 
     encode(osd_epoch_barrier, payload);
@@ -331,6 +341,11 @@ public:
     encode(nfiles, payload);
     encode(nsubdirs, payload);
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::make_message(Args&&... args);
 };
 
 #endif