From: Abhishek Lekshmanan Date: Mon, 29 Apr 2019 15:29:59 +0000 (+0200) Subject: rgw: rgw_bucket: set BucketInfo as const in rgw_remove_object X-Git-Tag: v14.2.2~16^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff44db78f6a62af2a9e2e5901930fd2021701d00;p=ceph.git rgw: rgw_bucket: set BucketInfo as const in rgw_remove_object Signed-off-by: Abhishek Lekshmanan (cherry picked from commit 1d1ea1fa391a18aa2251576b58676a7a05b7ebaa) --- diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 308a93ce04c0..889300ea7093 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -505,7 +505,7 @@ static bool bucket_object_check_filter(const string& oid) return rgw_obj_key::oid_to_key_in_ns(oid, &key, ns); } -int rgw_remove_object(RGWRados *store, RGWBucketInfo& bucket_info, rgw_bucket& bucket, rgw_obj_key& key) +int rgw_remove_object(RGWRados *store, const RGWBucketInfo& bucket_info, const rgw_bucket& bucket, rgw_obj_key& key) { RGWObjectCtx rctx(store); diff --git a/src/rgw/rgw_bucket.h b/src/rgw/rgw_bucket.h index c0a94230b1ae..2c483c0d3aba 100644 --- a/src/rgw/rgw_bucket.h +++ b/src/rgw/rgw_bucket.h @@ -208,7 +208,7 @@ extern int rgw_link_bucket(RGWRados* store, extern int rgw_unlink_bucket(RGWRados *store, const rgw_user& user_id, const string& tenant_name, const string& bucket_name, bool update_entrypoint = true); -extern int rgw_remove_object(RGWRados *store, RGWBucketInfo& bucket_info, rgw_bucket& bucket, rgw_obj_key& key); +extern int rgw_remove_object(RGWRados *store, const RGWBucketInfo& bucket_info, const rgw_bucket& bucket, rgw_obj_key& key); extern int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children); extern int rgw_remove_bucket_bypass_gc(RGWRados *store, rgw_bucket& bucket, int concurrent_max);