RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15107 from guihecheng/rgw_file-cleanup

Browse Source 
rgw: use pre-defined calls to replace raw flag operation
This commit is contained in:
Jos Collin 2017-05-19 08:05:29 +05:30 committed by GitHub
commit f24f4c8a23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rgw/rgw_file.h
View File

@ -282,7 +282,7 @@ namespace rgw {
variant_type = directory();
flags |= FLAG_BUCKET;
} else {
bucket = (parent->flags & FLAG_BUCKET) ? parent
bucket = parent->is_bucket() ? parent
: parent->bucket;
if (flags & FLAG_DIRECTORY) {
fh.fh_type = RGW_FS_TYPE_DIRECTORY;
@ -410,7 +410,7 @@ namespace rgw {
const std::string& bucket_name() const {
if (is_root())
return root_name;
if (flags & FLAG_BUCKET)
if (is_bucket())
return name;
return bucket->object_name();
}
@ -506,7 +506,7 @@ namespace rgw {
int open(uint32_t gsh_flags) {
lock_guard guard(mtx);
if (! (flags & FLAG_OPEN)) {
if (! is_open()) {
if (gsh_flags & RGW_OPEN_FLAG_V3) {
flags |= FLAG_STATELESS_OPEN;
}