RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10271 from linuxbox2/rgw-rename

Browse Source 
rgw_file: fix rename cases and unify unlink
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Orit Wasserman 2016-07-14 15:42:08 +02:00 committed by GitHub
commit a01e32d128
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/rgw/rgw_file.cc
View File

@ -208,13 +208,21 @@ namespace rgw {
return rc;
}
int RGWLibFS::unlink(RGWFileHandle* parent, const char *name)
int RGWLibFS::unlink(RGWFileHandle* rgw_fh, const char* name, uint32_t flags)
{
int rc = 0;
RGWFileHandle* parent = nullptr;
/* atomicity */
LookupFHResult fhr = lookup_fh(parent, name, RGWFileHandle::FLAG_LOCK);
RGWFileHandle* rgw_fh = get<0>(fhr);
if (unlikely(flags & RGWFileHandle::FLAG_UNLINK_THIS)) {
/* LOCKED */
parent = rgw_fh->get_parent();
} else {
/* atomicity */
parent = rgw_fh;
LookupFHResult fhr = lookup_fh(parent, name, RGWFileHandle::FLAG_LOCK);
rgw_fh = get<0>(fhr);
/* LOCKED */
}
if (parent->is_root()) {
/* XXXX remove uri and deal with bucket and object names */
@ -293,13 +301,11 @@ namespace rgw {
break;
case 1:
{
RGWDeleteObjRequest req(cct, get_user(), src_fh->bucket_name(),
src_name);
rc = rgwlib.get_fe()->execute_req(&req);
if (! rc) {
rc = req.get_ret();
rc = this->unlink(rgw_fh /* LOCKED */, _src_name,
RGWFileHandle::FLAG_UNLINK_THIS);
/* !LOCKED, -ref */
if (! rc)
goto out;
}
}
break;
default:
@ -307,12 +313,6 @@ namespace rgw {
} /* switch */
} /* ix */
out:
if (rgw_fh) {
rgw_fh->flags |= RGWFileHandle::FLAG_DELETED;
fh_cache.remove(rgw_fh->fh.fh_hk.object, rgw_fh, cohort::lru::FLAG_NONE);
rgw_fh->mtx.unlock();
unref(rgw_fh);
}
return rc;
} /* RGWLibFS::rename */

4
src/rgw/rgw_file.h
View File

@ -231,6 +231,7 @@ namespace rgw {
static constexpr uint32_t FLAG_BUCKET = 0x0020;
static constexpr uint32_t FLAG_LOCK = 0x0040;
static constexpr uint32_t FLAG_DELETED = 0x0080;
static constexpr uint32_t FLAG_UNLINK_THIS = 0x0100;
#define CREATE_FLAGS(x) \
((x) & ~(RGWFileHandle::FLAG_CREATE|RGWFileHandle::FLAG_LOCK))
@ -915,7 +916,8 @@ namespace rgw {
MkObjResult mkdir2(RGWFileHandle* parent, const char *name, struct stat *st,
uint32_t mask, uint32_t flags);
int unlink(RGWFileHandle* parent, const char *name);
int unlink(RGWFileHandle* rgw_fh, const char *name,
uint32_t flags = FLAG_NONE);
/* find existing RGWFileHandle */
RGWFileHandle* lookup_handle(struct rgw_fh_hk fh_hk) {