RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10299 from Yan-waller/yj-wiph-rgwmetadata-0715

Browse Source 
rgw: miscellaneous cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2016-08-08 14:35:48 -04:00 committed by GitHub
commit 39629678ec
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rgw/rgw_metadata.cc
View File

@ -518,8 +518,8 @@ RGWMetadataHandler *RGWMetadataManager::get_handler(const string& type)
void RGWMetadataManager::parse_metadata_key(const string& metadata_key, string& type, string& entry)
{
int pos = metadata_key.find(':');
if (pos < 0) {
auto pos = metadata_key.find(':');
if (pos == string::npos) {
type = metadata_key;
} else {
type = metadata_key.substr(0, pos);

3
src/rgw/rgw_rados.cc
View File

@ -4559,8 +4559,7 @@ int RGWRados::time_log_add(const string& oid, const real_time& ut, const string&
utime_t t(ut);
cls_log_add(op, t, section, key, bl);
r = io_ctx.operate(oid, &op);
return r;
return io_ctx.operate(oid, &op);
}
int RGWRados::time_log_add(const string& oid, list<cls_log_entry>& entries,