RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-20 18:33:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19129 from qrGitHub/wip-rgw-unused-param

Browse Source 
rgw: remove unused param in get_bucket_instance_policy_from_attr

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-12-18 14:11:43 -05:00 committed by GitHub
commit b5eaa02a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rgw/rgw_op.cc
View File

@ -172,8 +172,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);
@ -240,10 +239,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,