rgw/rest: removed unused 'objv' from RGWRESTConn::forward()

all callers of forward() and forward_iam_request() were passing null

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0de42922297b748bf4298e5a1539ef9b535d9aba)

diff --git a/src/rgw/radosgw-admin/radosgw-admin.cc b/src/rgw/radosgw-admin/radosgw-admin.cc
index 553ab371c89dc1f77e5e36a5e3e28118756fa3dd..035ed66d2d8a741f2f5192cac87372247006f597 100644 (file)
--- 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 aebbad773a9f96a4d7396c4dafd33b37de50f605..b924e51cc85213e122b3c96a0408612f0dac4c0f 100644 (file)
--- 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 ea2f28e567b46dfae0a58dc279519767b66494c9..5b6d218f69cd6331b361760bb63eff7d8432e090 100644 (file)
--- 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 ba819e49cc17ad5ea56e5b8a70d23213b19431bc..f6b939303e0a3772c1d7885f4382fbb74089405f 100644 (file)
--- 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, &params, 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, &params, 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 d23a27a865419926d190abbac49f340230cbcd56..c310f017c0dc08f13c031322787e3a9bc0652605 100644 (file)
--- 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 04a45203f47cfcd33de456b0269663a7bd1faee3..32ff7ac0a2282da3a78bd8f6c17188a5e130f6e9 100644 (file)
--- 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;