update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MOSDRepScrubMap.h b/ceph/src/messages/MOSDRepScrubMap.h
index 4e46672102ab2978caf6ada6091fbb4b0c3bd65d..51e8b02ee6ffa44bc1025f7e566a4de5453adc6c 100644 (file)
--- a/ceph/src/messages/MOSDRepScrubMap.h
+++ b/ceph/src/messages/MOSDRepScrubMap.h
@@ -21,7 +21,7 @@
  * pass a ScrubMap from a shard back to the primary
  */
 
-class MOSDRepScrubMap : public MOSDFastDispatchOp {
+class MOSDRepScrubMap final : public MOSDFastDispatchOp {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
@@ -29,7 +29,7 @@ public:
   spg_t pgid;            // primary spg_t
   epoch_t map_epoch = 0;
   pg_shard_t from;   // whose scrubmap this is
-  bufferlist scrub_map_bl;
+  ceph::buffer::list scrub_map_bl;
   bool preempted = false;
 
   epoch_t get_map_epoch() const override {
@@ -49,11 +49,11 @@ public:
       from(from) {}
 
 private:
-  ~MOSDRepScrubMap() {}
+  ~MOSDRepScrubMap() final {}
 
 public:
   std::string_view get_type_name() const override { return "rep_scrubmap"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "rep_scrubmap(" << pgid << " e" << map_epoch
        << " from shard " << from
        << (preempted ? " PREEMPTED":"") << ")";
@@ -67,6 +67,7 @@ public:
     encode(preempted, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(pgid, p);
     decode(map_epoch, p);