update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MFSMap.h b/ceph/src/messages/MFSMap.h
index 8f77a41f8cbebb71949f9046416995866b3a4947..fff7529d3717f217ae677ef62aaac36a50c55732 100644 (file)
--- a/ceph/src/messages/MFSMap.h
+++ b/ceph/src/messages/MFSMap.h
@@ -20,10 +20,9 @@
 #include "mds/FSMap.h"
 #include "include/ceph_features.h"
 
-class MFSMap : public Message {
+class MFSMap final : public Message {
 public:
   epoch_t epoch;
-  bufferlist encoded;
 
   version_t get_epoch() const { return epoch; }
   const FSMap& get_fsmap() const {return fsmap;}
@@ -38,16 +37,17 @@ public:
 private:
   FSMap fsmap;
 
-  ~MFSMap() override {}
+  ~MFSMap() final {}
 
 public:
   std::string_view get_type_name() const override { return "fsmap"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "fsmap(e " << epoch << ")";
   }
 
   // marshalling
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(epoch, p);
     decode(fsmap, p);