update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / cls / rbd / cls_rbd.h

diff --git a/ceph/src/cls/rbd/cls_rbd.h b/ceph/src/cls/rbd/cls_rbd.h
index 0dc0a9b94f153bfb8012fd5e619126c850429857..566bcdf6ca0d1d563ce641f08621bfa2a561f155 100644 (file)
--- a/ceph/src/cls/rbd/cls_rbd.h
+++ b/ceph/src/cls/rbd/cls_rbd.h
@@ -42,7 +42,7 @@ struct cls_rbd_parent {
     return !(*this == rhs);
   }
 
-  void encode(bufferlist& bl, uint64_t features) const {
+  void encode(ceph::buffer::list& bl, uint64_t features) const {
     // NOTE: remove support for version 1 after Nautilus EOLed
     uint8_t version = 1;
     if ((features & CEPH_FEATURE_SERVER_NAUTILUS) != 0ULL) {
@@ -65,7 +65,7 @@ struct cls_rbd_parent {
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(2, bl);
     decode(pool_id, bl);
     if (struct_v >= 2) {
@@ -83,7 +83,7 @@ struct cls_rbd_parent {
     DECODE_FINISH(bl);
   }
 
-  void dump(Formatter *f) const {
+  void dump(ceph::Formatter *f) const {
     f->dump_int("pool_id", pool_id);
     f->dump_string("pool_namespace", pool_namespace);
     f->dump_string("image_id", image_id);
@@ -93,7 +93,7 @@ struct cls_rbd_parent {
     }
   }
 
-  static void generate_test_instances(list<cls_rbd_parent*>& o) {
+  static void generate_test_instances(std::list<cls_rbd_parent*>& o) {
     o.push_back(new cls_rbd_parent{});
     o.push_back(new cls_rbd_parent{{1, "", "image id", 234}, {}});
     o.push_back(new cls_rbd_parent{{1, "", "image id", 234}, {123}});
@@ -134,7 +134,7 @@ struct cls_rbd_snap {
             (parent.exists()));
   }
 
-  void encode(bufferlist& bl, uint64_t features) const {
+  void encode(ceph::buffer::list& bl, uint64_t features) const {
     // NOTE: remove support for versions < 8 after Nautilus EOLed
     uint8_t min_version = 1;
     if ((features & CEPH_FEATURE_SERVER_NAUTILUS) != 0ULL) {
@@ -160,7 +160,7 @@ struct cls_rbd_snap {
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& p) {
+  void decode(ceph::buffer::list::const_iterator& p) {
     DECODE_START(8, p);
     decode(id, p);
     decode(name, p);
@@ -193,7 +193,7 @@ struct cls_rbd_snap {
     DECODE_FINISH(p);
   }
 
-  void dump(Formatter *f) const {
+  void dump(ceph::Formatter *f) const {
     f->dump_unsigned("id", id);
     f->dump_string("name", name);
     f->dump_unsigned("image_size", image_size);
@@ -221,7 +221,7 @@ struct cls_rbd_snap {
     }
   }
 
-  static void generate_test_instances(list<cls_rbd_snap*>& o) {
+  static void generate_test_instances(std::list<cls_rbd_snap*>& o) {
     o.push_back(new cls_rbd_snap{});
     o.push_back(new cls_rbd_snap{1, "snap", 123456,
                                  RBD_PROTECTION_STATUS_PROTECTED,