From 975d6e501c937a71b6a3b3323a26f10662f3c990 Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Tue, 3 Nov 2020 19:36:57 -0800
Subject: [PATCH] crimson/os/seastore: use unqualified en/decode for denc types

Otherwise, if definitions from encoding.h are in scope the templated
denc one won't be considered.

Signed-off-by: Samuel Just <sjust@redhat.com>
---
 src/crimson/os/seastore/journal.cc      | 16 ++++++++--------
 src/test/crimson/seastore/test_block.cc |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc
index 6626a24b00a90..161b03409a563 100644
--- a/src/crimson/os/seastore/journal.cc
+++ b/src/crimson/os/seastore/journal.cc
@@ -52,7 +52,7 @@ Journal::initialize_segment(Segment &segment)
     seq,
     segment.get_segment_id(),
     segment_provider->get_journal_tail_target()};
-  ::encode(header, bl);
+  encode(header, bl);
 
   bufferptr bp(
     ceph::buffer::create_page_aligned(
@@ -85,12 +85,12 @@ ceph::bufferlist Journal::encode_record(
     record.deltas.size(),
     record.extents.size()
   };
-  ::encode(header, metadatabl);
+  encode(header, metadatabl);
   for (const auto &i: record.extents) {
-    ::encode(extent_info_t(i), metadatabl);
+    encode(extent_info_t(i), metadatabl);
   }
   for (const auto &i: record.deltas) {
-    ::encode(i, metadatabl);
+    encode(i, metadatabl);
   }
   bufferlist databl;
   for (auto &i: record.extents) {
@@ -225,7 +225,7 @@ Journal::find_replay_segments_fut Journal::find_replay_segments()
 
 	    auto bp = bl.cbegin();
 	    try {
-	      ::decode(header, bp);
+	      decode(header, bp);
 	    } catch (ceph::buffer::error &e) {
 	      logger().debug(
 		"find_replay_segments: segment {} unable to decode "
@@ -337,7 +337,7 @@ Journal::read_record_metadata_ret Journal::read_record_metadata(
       auto bp = bl.cbegin();
       record_header_t header;
       try {
-	::decode(header, bp);
+	decode(header, bp);
       } catch (ceph::buffer::error &e) {
 	return read_record_metadata_ret(
 	  read_record_metadata_ertr::ready_future_marker{},
@@ -378,7 +378,7 @@ std::optional<std::vector<delta_info_t>> Journal::try_decode_deltas(
   std::vector<delta_info_t> deltas(header.deltas);
   for (auto &&i : deltas) {
     try {
-      ::decode(i, bliter);
+      decode(i, bliter);
     } catch (ceph::buffer::error &e) {
       return std::nullopt;
     }
@@ -396,7 +396,7 @@ std::optional<std::vector<extent_info_t>> Journal::try_decode_extent_infos(
   std::vector<extent_info_t> extent_infos(header.extents);
   for (auto &&i : extent_infos) {
     try {
-      ::decode(i, bliter);
+      decode(i, bliter);
     } catch (ceph::buffer::error &e) {
       return std::nullopt;
     }
diff --git a/src/test/crimson/seastore/test_block.cc b/src/test/crimson/seastore/test_block.cc
index 649e73bf7811d..f3d6531bd92d9 100644
--- a/src/test/crimson/seastore/test_block.cc
+++ b/src/test/crimson/seastore/test_block.cc
@@ -8,7 +8,7 @@ namespace crimson::os::seastore {
 
 ceph::bufferlist TestBlock::get_delta() {
   ceph::bufferlist bl;
-  ::encode(delta, bl);
+  encode(delta, bl);
   return bl;
 }
 
@@ -16,7 +16,7 @@ ceph::bufferlist TestBlock::get_delta() {
 void TestBlock::apply_delta(const ceph::bufferlist &bl) {
   auto biter = bl.begin();
   decltype(delta) deltas;
-  ::decode(deltas, biter);
+  decode(deltas, biter);
   for (auto &&d : deltas) {
     set_contents(d.val, d.offset, d.len);
   }
-- 
2.39.5