update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / os / kstore / kstore_types.h

diff --git a/ceph/src/os/kstore/kstore_types.h b/ceph/src/os/kstore/kstore_types.h
index 13c33fb6a2a819ab3f0b452eb211700d5e1b3f5d..859ea8f7dc879a3cd6a3b301cf3a1cdcf44b31d2 100644 (file)
--- a/ceph/src/os/kstore/kstore_types.h
+++ b/ceph/src/os/kstore/kstore_types.h
@@ -30,10 +30,10 @@ struct kstore_cnode_t {
 
   explicit kstore_cnode_t(int b=0) : bits(b) {}
 
-  void encode(bufferlist& bl) const;
-  void decode(bufferlist::const_iterator& p);
-  void dump(Formatter *f) const;
-  static void generate_test_instances(list<kstore_cnode_t*>& o);
+  void encode(ceph::buffer::list& bl) const;
+  void decode(ceph::buffer::list::const_iterator& p);
+  void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<kstore_cnode_t*>& o);
 };
 WRITE_CLASS_ENCODER(kstore_cnode_t)
 
@@ -41,7 +41,7 @@ WRITE_CLASS_ENCODER(kstore_cnode_t)
 struct kstore_onode_t {
   uint64_t nid;                        ///< numeric id (locally unique)
   uint64_t size;                       ///< object size
-  map<string, bufferptr> attrs;        ///< attrs
+  std::map<std::string, ceph::buffer::ptr> attrs;        ///< attrs
   uint64_t omap_head;                  ///< id for omap root node
   uint32_t stripe_size;                ///< stripe size
 
@@ -58,10 +58,10 @@ struct kstore_onode_t {
       expected_write_size(0),
       alloc_hint_flags(0) {}
 
-  void encode(bufferlist& bl) const;
-  void decode(bufferlist::const_iterator& p);
-  void dump(Formatter *f) const;
-  static void generate_test_instances(list<kstore_onode_t*>& o);
+  void encode(ceph::buffer::list& bl) const;
+  void decode(ceph::buffer::list::const_iterator& p);
+  void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<kstore_onode_t*>& o);
 };
 WRITE_CLASS_ENCODER(kstore_onode_t)