From 8063342fb90248493558269e20d3cc6c3a2382e9 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 28 Mar 2019 20:42:01 -0400
Subject: [PATCH] mgr: Update OSDPerfMetricTypes.h to work without using
 namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/mgr/OSDPerfMetricTypes.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mgr/OSDPerfMetricTypes.h b/src/mgr/OSDPerfMetricTypes.h
index b40c3de88cf3b..5a1dfc2cbbef9 100644
--- a/src/mgr/OSDPerfMetricTypes.h
+++ b/src/mgr/OSDPerfMetricTypes.h
@@ -92,14 +92,14 @@ struct denc_traits<OSDPerfMetricKeyDescriptor> {
     }
   }
   static void encode(const OSDPerfMetricKeyDescriptor& v,
-                     bufferlist::contiguous_appender& p) {
+		     ceph::buffer::list::contiguous_appender& p) {
     denc_varint(v.size(), p);
     for (auto& i : v) {
       denc(i, p);
     }
   }
   static void decode(OSDPerfMetricKeyDescriptor& v,
-                     bufferptr::const_iterator& p) {
+                     ceph::buffer::ptr::const_iterator& p) {
     unsigned num;
     denc_varint(num, p);
     v.clear();
@@ -185,8 +185,8 @@ struct PerformanceCounterDescriptor {
     DENC_FINISH(p);
   }
 
-  void pack_counter(const PerformanceCounter &c, bufferlist *bl) const;
-  void unpack_counter(bufferlist::const_iterator& bl,
+  void pack_counter(const PerformanceCounter &c, ceph::buffer::list *bl) const;
+  void unpack_counter(ceph::buffer::list::const_iterator& bl,
                       PerformanceCounter *c) const;
 };
 WRITE_CLASS_DENC(PerformanceCounterDescriptor)
@@ -212,14 +212,14 @@ struct denc_traits<PerformanceCounterDescriptors> {
     }
   }
   static void encode(const PerformanceCounterDescriptors& v,
-                     bufferlist::contiguous_appender& p) {
+                     ceph::buffer::list::contiguous_appender& p) {
     denc_varint(v.size(), p);
     for (auto& i : v) {
       denc(i, p);
     }
   }
   static void decode(PerformanceCounterDescriptors& v,
-                     bufferptr::const_iterator& p) {
+                     ceph::buffer::ptr::const_iterator& p) {
     unsigned num;
     denc_varint(num, p);
     v.clear();
@@ -329,7 +329,7 @@ struct OSDPerfMetricQuery {
     }
   }
 
-  void pack_counters(const PerformanceCounters &counters, bufferlist *bl) const;
+  void pack_counters(const PerformanceCounters &counters, ceph::buffer::list *bl) const;
 
   OSDPerfMetricKeyDescriptor key_descriptor;
   PerformanceCounterDescriptors performance_counter_descriptors;
@@ -340,7 +340,7 @@ std::ostream& operator<<(std::ostream& os, const OSDPerfMetricQuery &query);
 
 struct OSDPerfMetricReport {
   PerformanceCounterDescriptors performance_counter_descriptors;
-  std::map<OSDPerfMetricKey, bufferlist> group_packed_performance_counters;
+  std::map<OSDPerfMetricKey, ceph::buffer::list> group_packed_performance_counters;
 
   DENC(OSDPerfMetricReport, v, p) {
     DENC_START(1, 1, p);
-- 
2.39.5