update sources to v12.1.3

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

diff --git a/ceph/src/messages/MStatfs.h b/ceph/src/messages/MStatfs.h
index bf7560d0734e3cf62341f4e27e59689c86f6c350..a27ef9b54276ea4d1df48a54434986e30be07f3a 100644 (file)
--- a/ceph/src/messages/MStatfs.h
+++ b/ceph/src/messages/MStatfs.h
@@ -20,12 +20,19 @@
 #include "messages/PaxosServiceMessage.h"
 
 class MStatfs : public PaxosServiceMessage {
+
+  static const int HEAD_VERSION = 2;
+  static const int COMPAT_VERSION = 0;
+
 public:
   uuid_d fsid;
+  boost::optional<int64_t> data_pool;
 
-  MStatfs() : PaxosServiceMessage(CEPH_MSG_STATFS, 0) {}
-  MStatfs(const uuid_d& f, ceph_tid_t t, version_t v) :
-    PaxosServiceMessage(CEPH_MSG_STATFS, v), fsid(f) {
+  MStatfs() : PaxosServiceMessage(CEPH_MSG_STATFS, 0, HEAD_VERSION) {}
+  MStatfs(const uuid_d& f, ceph_tid_t t, boost::optional<int64_t> _data_pool,
+             version_t v) : PaxosServiceMessage(CEPH_MSG_STATFS, v,
+                                            HEAD_VERSION, COMPAT_VERSION),
+                                                fsid(f), data_pool(_data_pool) {
     set_tid(t);
   }
 
@@ -35,17 +42,24 @@ private:
 public:
   const char *get_type_name() const override { return "statfs"; }
   void print(ostream& out) const override {
-    out << "statfs(" << get_tid() << " v" << version << ")";
+    out << "statfs(" << get_tid() << " pool "
+        << (data_pool ? *data_pool : -1) << " v" << version << ")";
   }
 
   void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
+    ::encode(data_pool, payload);
   }
   void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
+    if (header.version >= 2) {
+      ::decode(data_pool, p);
+    } else {
+      data_pool = boost::optional<int64_t> ();
+    }
   }
 };