From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 11 Mar 2020 14:13:57 +0000 (-0400)
Subject: rgw: use qualified encode/decode in putobj processor
X-Git-Tag: v16.1.0~2727^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6686816b750259e7b45ccd8b845337a932b2d81;p=ceph.git

rgw: use qualified encode/decode in putobj processor

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_putobj_processor.cc b/src/rgw/rgw_putobj_processor.cc
index dedb3002bb2..a08966c5e8d 100644
--- a/src/rgw/rgw_putobj_processor.cc
+++ b/src/rgw/rgw_putobj_processor.cc
@@ -546,6 +546,7 @@ int AppendObjectProcessor::prepare(optional_yield y)
       return -ERR_POSITION_NOT_EQUAL_TO_LENGTH;
     }
     try {
+      using ceph::decode;
       decode(cur_part_num, iter->second);
     } catch (buffer::error& err) {
       ldpp_dout(dpp, 5) << "ERROR: failed to decode part num" << dendl;
@@ -634,6 +635,7 @@ int AppendObjectProcessor::complete(size_t accounted_size, const string &etag, c
   obj_op.meta.appendable = true;
   //Add the append part number
   bufferlist cur_part_num_bl;
+  using ceph::encode;
   encode(cur_part_num, cur_part_num_bl);
   attrs[RGW_ATTR_APPEND_PART_NUM] = cur_part_num_bl;
   //calculate the etag