From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Mon, 23 May 2016 11:27:24 +0000 (+0200)
Subject: rgw: remove unnecessary data copying in RGWPutMetadataBucket.
X-Git-Tag: v10.2.3~127^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8b7dd47018ab115ffa27b7e72470956de738fd3;p=ceph.git

rgw: remove unnecessary data copying in RGWPutMetadataBucket.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 19c12bbc233a118496f8ad5d640d19bb0e2c5d05)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index dc38f1d34e48..acde44eea395 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2833,8 +2833,6 @@ void RGWPutMetadataBucket::pre_exec()
 
 void RGWPutMetadataBucket::execute()
 {
-  map<string, buffer::list> orig_attrs;
-
   op_ret = get_params();
   if (op_ret < 0) {
     return;
@@ -2865,8 +2863,7 @@ void RGWPutMetadataBucket::execute()
 
   /* It's supposed that following functions WILL NOT change any special
    * attributes (like RGW_ATTR_ACL) if they are already present in attrs. */
-  orig_attrs = s->bucket_attrs; /* XXX map copy */
-  prepare_add_del_attrs(orig_attrs, rmattr_names, attrs);
+  prepare_add_del_attrs(s->bucket_attrs, rmattr_names, attrs);
   populate_with_generic_attrs(s, attrs);
 
   s->bucket_info.swift_ver_location = swift_ver_location;