rgw: remove unnecessary #include "rgw_rados.h"

rgw_rados.h not needed for compile

see https://tracker.ceph.com/issues/46880

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 9b0bc92423e87d6d8ec1e2cda1cea968e962df37..bb2a2a0c234e6d1612e07a0d5336ac3f7e406f70 100644 (file)
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -37,7 +37,6 @@
 #include "common/common_init.h"
 #include "common/dout.h"
 
-#include "rgw_rados.h"
 #include "rgw_resolve.h"
 #include "rgw_op.h"
 #include "rgw_rest.h"

diff --git a/src/rgw/rgw_aio_throttle.cc b/src/rgw/rgw_aio_throttle.cc
index e9546693275a4953dcbab00f7944f68bd71a0077..57d7e7fb9f1679a8247dcbd8266f6d7a7ef72db4 100644 (file)
--- a/src/rgw/rgw_aio_throttle.cc
+++ b/src/rgw/rgw_aio_throttle.cc
@@ -16,7 +16,6 @@
 #include "include/rados/librados.hpp"
 
 #include "rgw_aio_throttle.h"
-#include "rgw_rados.h"
 
 namespace rgw {
 

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index de9b6cdd74f0a82795942b5da951deae5ef1bb37..72d88d64a43603774c4173dd523983c5ae76cc74 100644 (file)
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -14,7 +14,6 @@
 #include "rgw_common.h"
 #include "rgw_acl.h"
 #include "rgw_string.h"
-#include "rgw_rados.h"
 #include "rgw_http_errors.h"
 #include "rgw_arn.h"
 #include "rgw_data_sync.h"

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 5e5346b864cff5b26344a7f94c2e515c16141f20..2213fb8ac69c8231d7a42d5a279cb8b1e20f6d19 100644 (file)
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -9,7 +9,6 @@
 #include "common/errno.h"
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_sync.h"
 #include "rgw_data_sync.h"

diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc
index 612d6d1e8b701a0584a72cd7d84e95b849f4da94..c6156aac39ff5b5610807dfcc6bd7c75f51a55f6 100644 (file)
--- a/src/rgw/rgw_dencoder.cc
+++ b/src/rgw/rgw_dencoder.cc
@@ -2,7 +2,6 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_log.h"
 #include "rgw_acl.h"

diff --git a/src/rgw/rgw_fcgi_process.cc b/src/rgw/rgw_fcgi_process.cc
index 452868a29c448f0a991eb456fa81799defbb3b89..3851afd52069870c59a41f7f08492acf1f5a6ac8 100644 (file)
--- a/src/rgw/rgw_fcgi_process.cc
+++ b/src/rgw/rgw_fcgi_process.cc
@@ -5,7 +5,6 @@
 #include "common/Throttle.h"
 #include "common/WorkQueue.h"
 
-#include "rgw_rados.h"
 #include "rgw_rest.h"
 #include "rgw_frontend.h"
 #include "rgw_request.h"

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index a7d8f8b912252d6aba6b9d0faffce19403e436d8..7ebd74dba1ac3e3b64882096ea96382ac8ba78c1 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -8,7 +8,6 @@
 #include <sys/stat.h>
 
 #include "rgw_lib.h"
-#include "rgw_rados.h"
 #include "rgw_resolve.h"
 #include "rgw_op.h"
 #include "rgw_rest.h"

diff --git a/src/rgw/rgw_gc.h b/src/rgw/rgw_gc.h
index 9eafb5fbd875ce735ee1c24beb6b470c747d3b9b..d45b54d5404665e08276a38f0f866e2e4eb10682 100644 (file)
--- a/src/rgw/rgw_gc.h
+++ b/src/rgw/rgw_gc.h
@@ -11,7 +11,7 @@
 #include "common/Cond.h"
 #include "common/Thread.h"
 #include "rgw_common.h"
-#include "rgw_rados.h"
+#include "rgw_sal.h"
 #include "cls/rgw/cls_rgw_types.h"
 
 #include <atomic>

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 035adf9b0e17803f941fc2ad70549a9937af450c..7b1aa80419eb482f289caa4cd590c32ddd58bc42 100644 (file)
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -2,7 +2,6 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_log.h"
 #include "rgw_acl.h"

diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h
index 60f3863fc837e942b03a89398e16cb576714b29e..21188f33d4fa256266298f2f129c4660dae2813d 100644 (file)
--- a/src/rgw/rgw_lc.h
+++ b/src/rgw/rgw_lc.h
@@ -17,7 +17,6 @@
 #include "common/iso_8601.h"
 #include "common/Thread.h"
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "cls/rgw/cls_rgw_types.h"
 #include "rgw_tag.h"
 #include "rgw_sal.h"

diff --git a/src/rgw/rgw_loadgen_process.cc b/src/rgw/rgw_loadgen_process.cc
index 6bc9ccd477691ad127055fdb50cea19e4e535f19..34842bf39d6767e5d489d1c604d7462f7d8ed7bf 100644 (file)
--- a/src/rgw/rgw_loadgen_process.cc
+++ b/src/rgw/rgw_loadgen_process.cc
@@ -5,7 +5,6 @@
 #include "common/Throttle.h"
 #include "common/WorkQueue.h"
 
-#include "rgw_rados.h"
 #include "rgw_rest.h"
 #include "rgw_frontend.h"
 #include "rgw_request.h"

diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc
index 976869a04d7530b2f28b7952795f9562df93feb0..85adfd7ea9d79ae52adbc199ee887d15ebe8392f 100644 (file)
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -10,7 +10,6 @@
 #include "rgw_bucket.h"
 #include "rgw_log.h"
 #include "rgw_acl.h"
-#include "rgw_rados.h"
 #include "rgw_client_io.h"
 #include "rgw_rest.h"
 #include "rgw_zone.h"

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 21c8c28fae77724e183585240054e947176690e7..78de1caaa9e0de59ad085411d203f7f0f46d829a 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -15,7 +15,7 @@
 #include "include/str_list.h"
 #include "include/stringify.h"
 #include "rgw_common.h"
-#include "rgw_rados.h"
+#include "rgw_sal.h"
 #include "rgw_period_pusher.h"
 #include "rgw_realm_reloader.h"
 #include "rgw_rest.h"

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index d5e0dceee373757ea0e7f269c6963253a69df461..401ad06257498952a053e5ef58cdd26ee1c2fbf0 100644 (file)
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -23,7 +23,6 @@
 
 #include "rgw_user.h"
 #include "rgw_bucket.h"
-#include "rgw_rados.h"
 #include "rgw_acl.h"
 #include "rgw_acl_s3.h"
 #include "rgw_log.h"

diff --git a/src/rgw/rgw_object_expirer_core.cc b/src/rgw/rgw_object_expirer_core.cc
index a0bc3ff3ae411d284233ff8c4e782cf020ecba02..be5b402b69025a1fcad15fbcd089fa13283349c9 100644 (file)
--- a/src/rgw/rgw_object_expirer_core.cc
+++ b/src/rgw/rgw_object_expirer_core.cc
@@ -23,7 +23,6 @@
 
 #include "rgw_user.h"
 #include "rgw_bucket.h"
-#include "rgw_rados.h"
 #include "rgw_acl.h"
 #include "rgw_acl_s3.h"
 #include "rgw_log.h"

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index f9bffb7ca38c8e270e7cc3b6a733bb3b142fa9f3..01bfebff5e7fa8b9b046d930372c6d5a8087e0d6 100644 (file)
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -8,7 +8,6 @@
 #include "common/Formatter.h"
 #include "common/errno.h"
 
-#include "rgw_rados.h"
 #include "rgw_op.h"
 #include "rgw_multi.h"
 #include "rgw_orphan.h"

diff --git a/src/rgw/rgw_period_history.cc b/src/rgw/rgw_period_history.cc
index 6cbb2325dd245ed50bd45f3ee91a639f31cf9900..497dd1d41431eec14f58629c9d95bf2ed823014c 100644 (file)
--- a/src/rgw/rgw_period_history.cc
+++ b/src/rgw/rgw_period_history.cc
@@ -2,7 +2,6 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_period_history.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 
 #include "include/ceph_assert.h"

diff --git a/src/rgw/rgw_process.cc b/src/rgw/rgw_process.cc
index 56560a660d720367a67ecbdc6b12a20161b44d2a..f9deb59e66aa157d7bac57f1b83e32b85daa99d0 100644 (file)
--- a/src/rgw/rgw_process.cc
+++ b/src/rgw/rgw_process.cc
@@ -6,7 +6,6 @@
 #include "common/WorkQueue.h"
 #include "include/scope_guard.h"
 
-#include "rgw_rados.h"
 #include "rgw_dmclock_scheduler.h"
 #include "rgw_rest.h"
 #include "rgw_frontend.h"

diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h
index c3c93409ac4bc0972fe47b2f793dfc3896e5a26a..27fed33ed08f69439670999e7ec56a30c30550b2 100644 (file)
--- a/src/rgw/rgw_process.h
+++ b/src/rgw/rgw_process.h
@@ -5,7 +5,6 @@
 #define RGW_PROCESS_H
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_acl.h"
 #include "rgw_auth_registry.h"
 #include "rgw_user.h"

diff --git a/src/rgw/rgw_pubsub.cc b/src/rgw/rgw_pubsub.cc
index 947578b2831a1a75b2ed9273f2100235569bdabd..2b68987c7ba5ca91b47fcb750521a0e9ece897b4 100644 (file)
--- a/src/rgw/rgw_pubsub.cc
+++ b/src/rgw/rgw_pubsub.cc
@@ -9,7 +9,6 @@
 #include "rgw_xml.h"
 #include "rgw_arn.h"
 #include "rgw_pubsub_push.h"
-#include "rgw_rados.h"
 #include <regex>
 #include <algorithm>
 

diff --git a/src/rgw/rgw_pubsub.h b/src/rgw/rgw_pubsub.h
index 256c5918585b7e6e22ebf7b548f26cf78fad0763..0415bbb9dde497860f0df5371febbe5a844f78b9 100644 (file)
--- a/src/rgw/rgw_pubsub.h
+++ b/src/rgw/rgw_pubsub.h
@@ -8,7 +8,6 @@
 #include "services/svc_sys_obj.h"
 #include "rgw_tools.h"
 #include "rgw_zone.h"
-#include "rgw_rados.h"
 #include "rgw_notify_event_type.h"
 #include <boost/container/flat_map.hpp>
 

diff --git a/src/rgw/rgw_putobj_processor.h b/src/rgw/rgw_putobj_processor.h
index b60d5ccf4772b8451f1ceeb9f7faf662d54234fa..42edfa77ebf4ee22fbbef1f15569686bc93f5614 100644 (file)
--- a/src/rgw/rgw_putobj_processor.h
+++ b/src/rgw/rgw_putobj_processor.h
@@ -18,7 +18,6 @@
 #include <optional>
 
 #include "rgw_putobj.h"
-#include "rgw_rados.h"
 #include "services/svc_rados.h"
 #include "services/svc_tier_rados.h"
 #include "rgw_sal.h"

diff --git a/src/rgw/rgw_realm_reloader.cc b/src/rgw/rgw_realm_reloader.cc
index 9dc8d1f4e706e280bc0f9506dc36843ed7c0b7fe..4dbd378dd0510c6802685f1c425a8a6dabc508b7 100644 (file)
--- a/src/rgw/rgw_realm_reloader.cc
+++ b/src/rgw/rgw_realm_reloader.cc
@@ -2,7 +2,6 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_realm_reloader.h"
-#include "rgw_rados.h"
 
 #include "rgw_bucket.h"
 #include "rgw_log.h"

diff --git a/src/rgw/rgw_request.h b/src/rgw/rgw_request.h
index a325ebd39b5f8ab343fa4a7bc9e905d92deb4d29..d332877b153d94701b90afa354bdcfe52da232d5 100644 (file)
--- a/src/rgw/rgw_request.h
+++ b/src/rgw/rgw_request.h
@@ -5,7 +5,6 @@
 #define RGW_REQUEST_H
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_acl.h"
 #include "rgw_user.h"
 #include "rgw_op.h"

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 0a66d17c77fe69e84300f285b3e79afc4ec2c350..2f79f366ac2c8b9787c017961b90d41b76429abb 100644 (file)
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -4,7 +4,6 @@
 #include <limits>
 #include <sstream>
 
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_bucket.h"
 #include "rgw_reshard.h"

diff --git a/src/rgw/rgw_rest_client.cc b/src/rgw/rgw_rest_client.cc
index 4ad08d8acfb39c88b3ea0ec5fcd0f0d7df886ef6..429b5cc7d34fc85a28bbb8da295925cdea64d7d5 100644 (file)
--- a/src/rgw/rgw_rest_client.cc
+++ b/src/rgw/rgw_rest_client.cc
@@ -5,7 +5,6 @@
 #include "rgw_rest_client.h"
 #include "rgw_auth_s3.h"
 #include "rgw_http_errors.h"
-#include "rgw_rados.h"
 
 #include "common/armor.h"
 #include "common/strtol.h"

diff --git a/src/rgw/rgw_rest_conn.cc b/src/rgw/rgw_rest_conn.cc
index 7d70cdb39937800252aaaabef2d78b2a06f4bc16..32e16884a787aa9aea960d17c6dc32ba10fadec6 100644 (file)
--- a/src/rgw/rgw_rest_conn.cc
+++ b/src/rgw/rgw_rest_conn.cc
@@ -1,7 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_rest_conn.h"
 #include "rgw_sal.h"

diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h
index 186f63eca9cde95dc60d23783f416e88e09d36ca..d0beabeaf0f762de6427f08564c78ab2bbf24605 100644 (file)
--- a/src/rgw/rgw_rest_conn.h
+++ b/src/rgw/rgw_rest_conn.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "rgw_rados.h"
 #include "rgw_rest_client.h"
 #include "common/ceph_json.h"
 #include "common/RefCountedObj.h"

diff --git a/src/rgw/rgw_sts.cc b/src/rgw/rgw_sts.cc
index 9b28eca67802f27aada5e81bc1d487ef45c7ba79..b4084c086401cf0c9948500bcfe9fd2b83317862 100644 (file)
--- a/src/rgw/rgw_sts.cc
+++ b/src/rgw/rgw_sts.cc
@@ -11,7 +11,6 @@
 #include "common/Formatter.h"
 #include "common/ceph_json.h"
 #include "common/ceph_time.h"
-#include "rgw_rados.h"
 #include "auth/Crypto.h"
 #include "include/ceph_fs.h"
 #include "common/iso_8601.h"

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 862382c6f4cff5cba272071d37ce030804fc7abe..618d903452e5b2d220bb0da3a66a11d2fe77e5ae 100644 (file)
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -12,7 +12,6 @@
 #include "common/errno.h"
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "rgw_sync.h"
 #include "rgw_metadata.h"

diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc
index 716a1086c8167d7b664dfe6721f2e3e339617043..d9847715fcfa8109b9caf6d99eb5e07a103d9355 100644 (file)
--- a/src/rgw/rgw_tools.cc
+++ b/src/rgw/rgw_tools.cc
@@ -12,7 +12,6 @@
 #include "include/stringify.h"
 
 #include "rgw_common.h"
-#include "rgw_rados.h"
 #include "rgw_tools.h"
 #include "rgw_acl_s3.h"
 #include "rgw_op.h"

diff --git a/src/rgw/rgw_trim_mdlog.cc b/src/rgw/rgw_trim_mdlog.cc
index 1c1941936aefbea7c5d831fe095089ddeb78f507..d1df9bcf751de2f5bab137eddbffcfc1c6b930ed 100644 (file)
--- a/src/rgw/rgw_trim_mdlog.cc
+++ b/src/rgw/rgw_trim_mdlog.cc
@@ -7,7 +7,6 @@
 #include "rgw_sync.h"
 #include "rgw_cr_rados.h"
 #include "rgw_cr_rest.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 #include "services/svc_zone.h"
 #include "services/svc_meta.h"