From: lu.shasha Date: Fri, 7 Apr 2017 08:54:38 +0000 (+0800) Subject: rgw: drop unused param "bucket" from select_bucket_placement X-Git-Tag: v12.0.3~153^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14390%2Fhead;p=ceph.git rgw: drop unused param "bucket" from select_bucket_placement Signed-off-by: Shasha Lu --- diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 8b2bc5f46df1..246949ffbf15 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -2120,7 +2120,7 @@ public: bci.info.bucket.name = bucket_name; bci.info.bucket.bucket_id = bucket_instance; bci.info.bucket.tenant = tenant_name; - ret = store->select_bucket_location_by_rule(bci.info.placement_rule, bci.info.bucket, &rule_info); + ret = store->select_bucket_location_by_rule(bci.info.placement_rule, &rule_info); if (ret < 0) { ldout(store->ctx(), 0) << "ERROR: select_bucket_placement() returned " << ret << dendl; return ret; diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 393af6b44385..9af7aa7cd7ce 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -2303,7 +2303,7 @@ void RGWCreateBucket::execute() bucket.name = s->bucket_name; op_ret = store->select_bucket_placement(*(s->user), zonegroup_id, placement_rule, - bucket, &selected_placement_rule, nullptr); + &selected_placement_rule, nullptr); if (selected_placement_rule != s->bucket_info.placement_rule) { op_ret = -EEXIST; return; @@ -5465,7 +5465,6 @@ int RGWBulkUploadOp::handle_dir(const boost::string_ref path) op_ret = store->select_bucket_placement(*(s->user), store->get_zonegroup().get_id(), placement_rule, - bucket, &selected_placement_rule, nullptr); if (selected_placement_rule != binfo.placement_rule) { diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index cdeca8ab4c98..3536e14dc554 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -5362,7 +5362,7 @@ int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket, for (int i = 0; i < MAX_CREATE_RETRIES; i++) { int ret = 0; - ret = select_bucket_placement(owner, zonegroup_id, placement_rule, bucket, + ret = select_bucket_placement(owner, zonegroup_id, placement_rule, &selected_placement_rule_name, &rule_info); if (ret < 0) return ret; @@ -5453,7 +5453,7 @@ int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket, } int RGWRados::select_new_bucket_location(RGWUserInfo& user_info, const string& zonegroup_id, const string& request_rule, - rgw_bucket& bucket, string *pselected_rule_name, RGWZonePlacementInfo *rule_info) + string *pselected_rule_name, RGWZonePlacementInfo *rule_info) { /* first check that rule exists within the specific zonegroup */ @@ -5494,16 +5494,16 @@ int RGWRados::select_new_bucket_location(RGWUserInfo& user_info, const string& z if (pselected_rule_name) *pselected_rule_name = rule; - return select_bucket_location_by_rule(rule, bucket, rule_info); + return select_bucket_location_by_rule(rule, rule_info); } -int RGWRados::select_bucket_location_by_rule(const string& location_rule, rgw_bucket& bucket, RGWZonePlacementInfo *rule_info) +int RGWRados::select_bucket_location_by_rule(const string& location_rule, RGWZonePlacementInfo *rule_info) { if (location_rule.empty()) { /* we can only reach here if we're trying to set a bucket location from a bucket * created on a different zone, using a legacy / default pool configuration */ - return select_legacy_bucket_placement(bucket, rule_info); + return select_legacy_bucket_placement(rule_info); } /* @@ -5534,21 +5534,21 @@ int RGWRados::select_bucket_location_by_rule(const string& location_rule, rgw_bu } int RGWRados::select_bucket_placement(RGWUserInfo& user_info, const string& zonegroup_id, const string& placement_rule, - rgw_bucket& bucket, string *pselected_rule_name, RGWZonePlacementInfo *rule_info) + string *pselected_rule_name, RGWZonePlacementInfo *rule_info) { if (!get_zone_params().placement_pools.empty()) { return select_new_bucket_location(user_info, zonegroup_id, placement_rule, - bucket, pselected_rule_name, rule_info); + pselected_rule_name, rule_info); } if (pselected_rule_name) { pselected_rule_name->clear(); } - return select_legacy_bucket_placement(bucket, rule_info); + return select_legacy_bucket_placement(rule_info); } -int RGWRados::select_legacy_bucket_placement(rgw_bucket& bucket, RGWZonePlacementInfo *rule_info) +int RGWRados::select_legacy_bucket_placement(RGWZonePlacementInfo *rule_info) { bufferlist map_bl; map m; diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 4a4f75c2bb53..866bbabcd093 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -2521,11 +2521,11 @@ public: */ int init_bucket_index(RGWBucketInfo& bucket_info, int num_shards); int select_bucket_placement(RGWUserInfo& user_info, const string& zonegroup_id, const string& rule, - rgw_bucket& bucket, string *pselected_rule_name, RGWZonePlacementInfo *rule_info); - int select_legacy_bucket_placement(rgw_bucket& bucket, RGWZonePlacementInfo *rule_info); + string *pselected_rule_name, RGWZonePlacementInfo *rule_info); + int select_legacy_bucket_placement(RGWZonePlacementInfo *rule_info); int select_new_bucket_location(RGWUserInfo& user_info, const string& zonegroup_id, const string& rule, - rgw_bucket& bucket, string *pselected_rule_name, RGWZonePlacementInfo *rule_info); - int select_bucket_location_by_rule(const string& location_rule, rgw_bucket& bucket, RGWZonePlacementInfo *rule_info); + string *pselected_rule_name, RGWZonePlacementInfo *rule_info); + int select_bucket_location_by_rule(const string& location_rule, RGWZonePlacementInfo *rule_info); void create_bucket_id(string *bucket_id); bool get_obj_data_pool(const string& placement_rule, const rgw_obj& obj, rgw_pool *pool);