From: Orit Wasserman Date: Fri, 14 Apr 2017 10:00:39 +0000 (+0300) Subject: rgw: use const string for oid in get_bucket_instance_from_oid X-Git-Tag: ses5-milestone6~8^2~7^2~86 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e30c37865f91796c2e4cd093255568a8f6a0d3b;p=ceph.git rgw: use const string for oid in get_bucket_instance_from_oid Signed-off-by: Orit Wasserman --- diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index c6ffb2c78d25..034416f8e1c7 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -11265,7 +11265,7 @@ int RGWRados::get_bucket_instance_info(RGWObjectCtx& obj_ctx, const rgw_bucket& return get_bucket_instance_from_oid(obj_ctx, oid, info, pmtime, pattrs); } -int RGWRados::get_bucket_instance_from_oid(RGWObjectCtx& obj_ctx, string& oid, RGWBucketInfo& info, +int RGWRados::get_bucket_instance_from_oid(RGWObjectCtx& obj_ctx, const string& oid, RGWBucketInfo& info, real_time *pmtime, map *pattrs, rgw_cache_entry_info *cache_info) { diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 64f06b03993e..c8472e834652 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -3307,7 +3307,7 @@ public: ceph::real_time *pmtime, map *pattrs, rgw_cache_entry_info *cache_info = NULL); int get_bucket_instance_info(RGWObjectCtx& obj_ctx, const string& meta_key, RGWBucketInfo& info, ceph::real_time *pmtime, map *pattrs); int get_bucket_instance_info(RGWObjectCtx& obj_ctx, const rgw_bucket& bucket, RGWBucketInfo& info, ceph::real_time *pmtime, map *pattrs); - int get_bucket_instance_from_oid(RGWObjectCtx& obj_ctx, string& oid, RGWBucketInfo& info, ceph::real_time *pmtime, map *pattrs, + int get_bucket_instance_from_oid(RGWObjectCtx& obj_ctx, const string& oid, RGWBucketInfo& info, ceph::real_time *pmtime, map *pattrs, rgw_cache_entry_info *cache_info = NULL); int convert_old_bucket_info(RGWObjectCtx& obj_ctx, const string& tenant_name, const string& bucket_name);