From 62fb93a740eccc8e06f531657b912d415c7aa65d Mon Sep 17 00:00:00 2001
From: Jiaying Ren <jiaying.ren@umcloud.com>
Date: Tue, 20 Jun 2017 15:00:55 +0800
Subject: [PATCH] rgw: swift ignore obj storage policy during change obj meta

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
---
 src/rgw/rgw_op.h          | 1 -
 src/rgw/rgw_rest_swift.cc | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 632367b9b0acc..01a3609f2847f 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -1193,7 +1193,6 @@ class RGWPutMetadataBucket : public RGWOp {
 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 90a829da5b926..5de2ee12539fe 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;