]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: remove unused param in get_bucket_instance_policy_from_attr 19129/head
authorBingyin Zhang <zhangbingyin@cloudin.cn>
Fri, 24 Nov 2017 13:55:00 +0000 (21:55 +0800)
committerBingyin Zhang <zhangbingyin@cloudin.cn>
Fri, 24 Nov 2017 13:55:00 +0000 (21:55 +0800)
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
src/rgw/rgw_op.cc

index 73aa0ed543716abb80530aa9b728f68431b8423f..92c8e5c4767ef8cbdfc296d592e7db06abbf5e7a 100644 (file)
@@ -175,8 +175,7 @@ static int get_bucket_instance_policy_from_attr(CephContext *cct,
                                                RGWRados *store,
                                                RGWBucketInfo& bucket_info,
                                                map<string, bufferlist>& bucket_attrs,
-                                               RGWAccessControlPolicy *policy,
-                                               rgw_raw_obj& obj)
+                                               RGWAccessControlPolicy *policy)
 {
   map<string, bufferlist>::iterator aiter = bucket_attrs.find(RGW_ATTR_ACL);
 
@@ -243,10 +242,7 @@ static int get_bucket_policy_from_attr(CephContext *cct,
                                       map<string, bufferlist>& bucket_attrs,
                                       RGWAccessControlPolicy *policy)
 {
-  rgw_raw_obj instance_obj;
-  store->get_bucket_instance_obj(bucket_info.bucket, instance_obj);
-  return get_bucket_instance_policy_from_attr(cct, store, bucket_info, bucket_attrs,
-                                             policy, instance_obj);
+  return get_bucket_instance_policy_from_attr(cct, store, bucket_info, bucket_attrs, policy);
 }
 
 static optional<Policy> get_iam_policy_from_attr(CephContext* cct,