From: Jiaying Ren <jiaying.ren@umcloud.com>
Date: Tue, 20 Jun 2017 07:00:55 +0000 (+0800)
Subject: rgw: swift ignore obj storage policy during change obj meta
X-Git-Tag: v13.0.2~597^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62fb93a740eccc8e06f531657b912d415c7aa65d;p=ceph.git

rgw: swift ignore obj storage policy during change obj meta

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
---

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 632367b9b0ac..01a3609f2847 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -1193,7 +1193,6 @@ public:
 class RGWPutMetadataObject : public RGWOp {
 protected:
   RGWAccessControlPolicy policy;
-  string placement_rule;
   boost::optional<ceph::real_time> delete_at;
   const char *dlo_manifest;
 
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 90a829da5b92..5de2ee12539f 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -943,7 +943,6 @@ int RGWPutMetadataObject_ObjStore_SWIFT::get_params()
     return r;
   }
 
-  placement_rule = s->info.env->get("HTTP_X_STORAGE_POLICY", "");
   dlo_manifest = s->info.env->get("HTTP_X_OBJECT_MANIFEST");
 
   return 0;