From 0de42922297b748bf4298e5a1539ef9b535d9aba Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sun, 27 Apr 2025 10:17:09 -0400 Subject: [PATCH] rgw/rest: removed unused 'objv' from RGWRESTConn::forward() all callers of forward() and forward_iam_request() were passing null Signed-off-by: Casey Bodley --- src/rgw/radosgw-admin/radosgw-admin.cc | 2 +- src/rgw/rgw_op.cc | 2 +- src/rgw/rgw_period_puller.cc | 2 +- src/rgw/rgw_rest_conn.cc | 16 ++-------------- src/rgw/rgw_rest_conn.h | 4 ++-- src/rgw/rgw_rest_iam.cc | 2 +- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/rgw/radosgw-admin/radosgw-admin.cc b/src/rgw/radosgw-admin/radosgw-admin.cc index e86a79cfdc6..8540261776d 100644 --- a/src/rgw/radosgw-admin/radosgw-admin.cc +++ b/src/rgw/radosgw-admin/radosgw-admin.cc @@ -1902,7 +1902,7 @@ static int send_to_remote_gateway(RGWRESTConn* conn, req_info& info, ceph::bufferlist response; rgw_user user; - int ret = conn->forward(dpp(), user, info, nullptr, MAX_REST_RESPONSE, &in_data, &response, null_yield); + int ret = conn->forward(dpp(), user, info, MAX_REST_RESPONSE, &in_data, &response, null_yield); int parse_ret = parser.parse(response.c_str(), response.length()); if (parse_ret < 0) { diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 75b38f09afa..1f2624a4e10 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -155,7 +155,7 @@ int rgw_forward_request_to_master(const DoutPrefixProvider* dpp, creds, site.get_zonegroup().id, zg->second.api_name}; bufferlist outdata; constexpr size_t max_response_size = 128 * 1024; // we expect a very small response - int ret = conn.forward(dpp, effective_owner, req, nullptr, + int ret = conn.forward(dpp, effective_owner, req, max_response_size, indata, &outdata, y); if (ret < 0) { return ret; diff --git a/src/rgw/rgw_period_puller.cc b/src/rgw/rgw_period_puller.cc index ea2f28e567b..5b6d218f69c 100644 --- a/src/rgw/rgw_period_puller.cc +++ b/src/rgw/rgw_period_puller.cc @@ -40,7 +40,7 @@ int pull_period(const DoutPrefixProvider *dpp, RGWRESTConn* conn, const std::str bufferlist data; #define MAX_REST_RESPONSE (128 * 1024) - int r = conn->forward(dpp, user, info, nullptr, MAX_REST_RESPONSE, nullptr, &data, y); + int r = conn->forward(dpp, user, info, MAX_REST_RESPONSE, nullptr, &data, y); if (r < 0) { return r; } diff --git a/src/rgw/rgw_rest_conn.cc b/src/rgw/rgw_rest_conn.cc index 770ccae2990..46dd7323c44 100644 --- a/src/rgw/rgw_rest_conn.cc +++ b/src/rgw/rgw_rest_conn.cc @@ -153,7 +153,7 @@ void RGWRESTConn::populate_params(param_vec_t& params, const rgw_owner* uid, con populate_zonegroup(params, zonegroup); } -int RGWRESTConn::forward(const DoutPrefixProvider *dpp, const rgw_owner& uid, const req_info& info, obj_version *objv, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y) +int RGWRESTConn::forward(const DoutPrefixProvider *dpp, const rgw_owner& uid, const req_info& info, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y) { int ret = 0; @@ -165,12 +165,6 @@ int RGWRESTConn::forward(const DoutPrefixProvider *dpp, const rgw_owner& uid, co return ret; param_vec_t params; populate_params(params, &uid, self_zone_group); - if (objv) { - params.push_back(param_pair_t(RGW_SYS_PARAM_PREFIX "tag", objv->tag)); - char buf[16]; - snprintf(buf, sizeof(buf), "%lld", (long long)objv->ver); - params.push_back(param_pair_t(RGW_SYS_PARAM_PREFIX "ver", buf)); - } RGWRESTSimpleRequest req(cct, info.method, url, NULL, ¶ms, api_name); ret = req.forward_request(dpp, key, info, max_response, inbl, outbl, y); if (ret == -EIO) { @@ -185,7 +179,7 @@ int RGWRESTConn::forward(const DoutPrefixProvider *dpp, const rgw_owner& uid, co return ret; } -int RGWRESTConn::forward_iam_request(const DoutPrefixProvider *dpp, const req_info& info, obj_version *objv, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y) +int RGWRESTConn::forward_iam_request(const DoutPrefixProvider *dpp, const req_info& info, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y) { int ret = 0; @@ -196,12 +190,6 @@ int RGWRESTConn::forward_iam_request(const DoutPrefixProvider *dpp, const req_in if (ret < 0) return ret; param_vec_t params; - if (objv) { - params.push_back(param_pair_t(RGW_SYS_PARAM_PREFIX "tag", objv->tag)); - char buf[16]; - snprintf(buf, sizeof(buf), "%lld", (long long)objv->ver); - params.push_back(param_pair_t(RGW_SYS_PARAM_PREFIX "ver", buf)); - } std::string service = "iam"; RGWRESTSimpleRequest req(cct, info.method, url, NULL, ¶ms, api_name); // coverity[uninit_use_in_call:SUPPRESS] diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h index 7abf86a3d3f..21bfdeb8930 100644 --- a/src/rgw/rgw_rest_conn.h +++ b/src/rgw/rgw_rest_conn.h @@ -130,10 +130,10 @@ public: virtual void populate_params(param_vec_t& params, const rgw_owner* uid, const std::string& zonegroup); /* sync request */ - int forward(const DoutPrefixProvider *dpp, const rgw_owner& uid, const req_info& info, obj_version *objv, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y); + int forward(const DoutPrefixProvider *dpp, const rgw_owner& uid, const req_info& info, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y); /* sync request */ - int forward_iam_request(const DoutPrefixProvider *dpp, const req_info& info, obj_version *objv, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y); + int forward_iam_request(const DoutPrefixProvider *dpp, const req_info& info, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y); /* async requests */ diff --git a/src/rgw/rgw_rest_iam.cc b/src/rgw/rgw_rest_iam.cc index 04a45203f47..32ff7ac0a22 100644 --- a/src/rgw/rgw_rest_iam.cc +++ b/src/rgw/rgw_rest_iam.cc @@ -304,7 +304,7 @@ int forward_iam_request_to_master(const DoutPrefixProvider* dpp, std::move(creds), zg->second.id, zg->second.api_name}; bufferlist outdata; constexpr size_t max_response_size = 128 * 1024; // we expect a very small response - int ret = conn.forward_iam_request(dpp, req, nullptr, max_response_size, + int ret = conn.forward_iam_request(dpp, req, max_response_size, &indata, &outdata, y); if (ret < 0) { return ret; -- 2.39.5