From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Tue, 24 May 2016 10:03:26 +0000 (+0200)
Subject: rgw: reuse populate_with_generic_attrs() across rgw_op.cc.
X-Git-Tag: v11.0.0~350^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78d12c692793efa4cf501a313e171582b53ae3ab;p=ceph.git

rgw: reuse populate_with_generic_attrs() across rgw_op.cc.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 76a408cdcd20..c2a60608accd 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2560,13 +2560,7 @@ void RGWPutObj::execute()
   bl.append(etag.c_str(), etag.size() + 1);
   emplace_attr(RGW_ATTR_ETAG, std::move(bl));
 
-  for (iter = s->generic_attrs.begin(); iter != s->generic_attrs.end();
-       ++iter) {
-    bufferlist& attrbl = attrs[iter->first];
-    const string& val = iter->second;
-    attrbl.append(val.c_str(), val.size() + 1);
-  }
-
+  populate_with_generic_attrs(s, attrs);
   rgw_get_request_metadata(s->cct, s->info, attrs);
   encode_delete_at_attr(delete_at, attrs);
 
@@ -3248,13 +3242,7 @@ int RGWCopyObj::init_common()
   emplace_attr(RGW_ATTR_ACL, std::move(aclbl));
 
   rgw_get_request_metadata(s->cct, s->info, attrs);
-
-  map<string, string>::iterator iter;
-  for (iter = s->generic_attrs.begin(); iter != s->generic_attrs.end(); ++iter) {
-    bufferlist& attrbl = attrs[iter->first];
-    const string& val = iter->second;
-    attrbl.append(val.c_str(), val.size() + 1);
-  }
+  populate_with_generic_attrs(s, attrs);
 
   return 0;
 }
@@ -3700,15 +3688,9 @@ void RGWInitMultipart::execute()
     return;
 
   policy.encode(aclbl);
-
   attrs[RGW_ATTR_ACL] = aclbl;
 
-  for (iter = s->generic_attrs.begin(); iter != s->generic_attrs.end(); ++iter) {
-    bufferlist& attrbl = attrs[iter->first];
-    const string& val = iter->second;
-    attrbl.append(val.c_str(), val.size() + 1);
-  }
-
+  populate_with_generic_attrs(s, attrs);
   rgw_get_request_metadata(s->cct, s->info, attrs);
 
   do {