RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 14:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15928 from liewegas/wip-rgw-warning

Browse Source 
rgw/rgw_op: fix whitespace and indentation warning

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-06-27 10:30:02 -04:00 committed by GitHub
commit c30b28f1b2
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/rgw/rgw_op.cc
View File

@ -702,7 +702,8 @@ int RGWGetObjTags::verify_permission()
return 0;
}
void RGWGetObjTags::pre_exec(){
void RGWGetObjTags::pre_exec()
{
rgw_bucket_object_pre_exec(s);
}
@ -736,12 +737,10 @@ int RGWPutObjTags::verify_permission()
void RGWPutObjTags::execute()
{
op_ret = get_params();
if (op_ret < 0)
return;
if (s->object.empty()){
op_ret= -EINVAL; // we only support tagging on existing objects
return;
@ -756,14 +755,15 @@ void RGWPutObjTags::execute()
}
}
void RGWDeleteObjTags::pre_exec(){
void RGWDeleteObjTags::pre_exec()
{
rgw_bucket_object_pre_exec(s);
}
int RGWDeleteObjTags::verify_permission(){
if (!s->object.empty()){
int RGWDeleteObjTags::verify_permission()
{
if (!s->object.empty()) {
if (!verify_object_permission(s,
s->object.instance.empty() ?
rgw::IAM::s3DeleteObjectTagging:
@ -773,18 +773,19 @@ int RGWDeleteObjTags::verify_permission(){
return 0;
}
void RGWDeleteObjTags::execute() {
void RGWDeleteObjTags::execute()
{
if (s->object.empty())
return;
rgw_obj obj;
obj = rgw_obj(s->bucket, s->object);
store->set_atomic(s->obj_ctx, obj);
map <string, bufferlist> attrs;
map <string, bufferlist> rmattr;
bufferlist bl;
rmattr[RGW_ATTR_TAGS] = bl;
op_ret = store->set_attrs(s->obj_ctx, s->bucket_info, obj, attrs, &rmattr);
rgw_obj obj;
obj = rgw_obj(s->bucket, s->object);
store->set_atomic(s->obj_ctx, obj);
map <string, bufferlist> attrs;
map <string, bufferlist> rmattr;
bufferlist bl;
rmattr[RGW_ATTR_TAGS] = bl;
op_ret = store->set_attrs(s->obj_ctx, s->bucket_info, obj, attrs, &rmattr);
}
int RGWOp::do_aws4_auth_completion()