From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 20 Oct 2022 19:32:45 +0000 (-0400)
Subject: rgw: remove unused RGWProcessEnv::port
X-Git-Tag: v18.1.0~650^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6bdfcd25f049db64609d2b2ebf10f1dbac564d73;p=ceph.git

rgw: remove unused RGWProcessEnv::port

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index cea408c174519..5b5d66271973b 100644
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -416,12 +416,10 @@ int rgw::AppMain::init_frontends2(RGWLib* rgwlib)
     RGWFrontend* fe = nullptr;
 
     if (framework == "loadgen") {
-      int port;
-      config->get_val("port", 80, &port);
       std::string uri_prefix;
       config->get_val("prefix", "", &uri_prefix);
 
-      RGWProcessEnv env = {driver, &rest, olog, port, uri_prefix,
+      RGWProcessEnv env = {driver, &rest, olog, uri_prefix,
 	    auth_registry, ratelimiter.get(), lua_background.get()};
 
       fe = new RGWLoadGenFrontend(env, config);
@@ -431,13 +429,12 @@ int rgw::AppMain::init_frontends2(RGWLib* rgwlib)
       config->get_val("port", 80, &port);
       std::string uri_prefix;
       config->get_val("prefix", "", &uri_prefix);
-      RGWProcessEnv env{driver, &rest, olog, port, uri_prefix,
+      RGWProcessEnv env{driver, &rest, olog, uri_prefix,
 	    auth_registry, ratelimiter.get(), lua_background.get()};
       fe = new RGWAsioFrontend(env, config, *(sched_ctx.get()));
     }
     else if (framework == "rgw-nfs") {
-      int port = 80;
-      RGWProcessEnv env = { driver, &rest, olog, port };
+      RGWProcessEnv env = { driver, &rest, olog };
       fe = new RGWLibFrontend(env, config);
       if (rgwlib) {
         rgwlib->set_fe(static_cast<RGWLibFrontend*>(fe));
diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h
index db7752547fe43..6346f5228c486 100644
--- a/src/rgw/rgw_process.h
+++ b/src/rgw/rgw_process.h
@@ -32,7 +32,6 @@ struct RGWProcessEnv {
   rgw::sal::Driver* driver;
   RGWREST *rest;
   OpsLogSink *olog;
-  int port;
   std::string uri_prefix;
   std::shared_ptr<rgw::auth::StrategyRegistry> auth_registry;
   //maybe there is a better place to driver the rate limit data structure