From 04e8e363560ae4d3392063825d026bca254d69ac Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 7 Aug 2020 17:27:55 -0400 Subject: [PATCH] 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 --- src/rgw/librgw.cc | 1 - src/rgw/rgw_aio_throttle.cc | 1 - src/rgw/rgw_common.cc | 1 - src/rgw/rgw_data_sync.cc | 1 - src/rgw/rgw_dencoder.cc | 1 - src/rgw/rgw_fcgi_process.cc | 1 - src/rgw/rgw_file.cc | 1 - src/rgw/rgw_gc.h | 2 +- src/rgw/rgw_json_enc.cc | 1 - src/rgw/rgw_lc.h | 1 - src/rgw/rgw_loadgen_process.cc | 1 - src/rgw/rgw_log.cc | 1 - src/rgw/rgw_main.cc | 2 +- src/rgw/rgw_object_expirer.cc | 1 - src/rgw/rgw_object_expirer_core.cc | 1 - src/rgw/rgw_orphan.cc | 1 - src/rgw/rgw_period_history.cc | 1 - src/rgw/rgw_process.cc | 1 - src/rgw/rgw_process.h | 1 - src/rgw/rgw_pubsub.cc | 1 - src/rgw/rgw_pubsub.h | 1 - src/rgw/rgw_putobj_processor.h | 1 - src/rgw/rgw_realm_reloader.cc | 1 - src/rgw/rgw_request.h | 1 - src/rgw/rgw_reshard.cc | 1 - src/rgw/rgw_rest_client.cc | 1 - src/rgw/rgw_rest_conn.cc | 1 - src/rgw/rgw_rest_conn.h | 1 - src/rgw/rgw_sts.cc | 1 - src/rgw/rgw_sync.cc | 1 - src/rgw/rgw_tools.cc | 1 - src/rgw/rgw_trim_mdlog.cc | 1 - 32 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc index 9b0bc92423e8..bb2a2a0c234e 100644 --- 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 e9546693275a..57d7e7fb9f16 100644 --- 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 de9b6cdd74f0..72d88d64a436 100644 --- 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 5e5346b864cf..2213fb8ac69c 100644 --- 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 612d6d1e8b70..c6156aac39ff 100644 --- 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 452868a29c44..3851afd52069 100644 --- 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 a7d8f8b91225..7ebd74dba1ac 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -8,7 +8,6 @@ #include #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 9eafb5fbd875..d45b54d54046 100644 --- 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 diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc index 035adf9b0e17..7b1aa80419eb 100644 --- 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 60f3863fc837..21188f33d4fa 100644 --- 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 6bc9ccd47769..34842bf39d67 100644 --- 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 976869a04d75..85adfd7ea9d7 100644 --- 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 21c8c28fae77..78de1caaa9e0 100644 --- 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 d5e0dceee373..401ad0625749 100644 --- 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 a0bc3ff3ae41..be5b402b6902 100644 --- 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 f9bffb7ca38c..01bfebff5e7f 100644 --- 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 6cbb2325dd24..497dd1d41431 100644 --- 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 56560a660d72..f9deb59e66aa 100644 --- 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 c3c93409ac4b..27fed33ed08f 100644 --- 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 947578b2831a..2b68987c7ba5 100644 --- 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 #include diff --git a/src/rgw/rgw_pubsub.h b/src/rgw/rgw_pubsub.h index 256c5918585b..0415bbb9dde4 100644 --- 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 diff --git a/src/rgw/rgw_putobj_processor.h b/src/rgw/rgw_putobj_processor.h index b60d5ccf4772..42edfa77ebf4 100644 --- a/src/rgw/rgw_putobj_processor.h +++ b/src/rgw/rgw_putobj_processor.h @@ -18,7 +18,6 @@ #include #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 9dc8d1f4e706..4dbd378dd051 100644 --- 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 a325ebd39b5f..d332877b153d 100644 --- 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 0a66d17c77fe..2f79f366ac2c 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -4,7 +4,6 @@ #include #include -#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 4ad08d8acfb3..429b5cc7d34f 100644 --- 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 7d70cdb39937..32e16884a787 100644 --- 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 186f63eca9cd..d0beabeaf0f7 100644 --- 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 9b28eca67802..b4084c086401 100644 --- 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 862382c6f4cf..618d903452e5 100644 --- 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 716a1086c816..d9847715fcfa 100644 --- 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 1c1941936aef..d1df9bcf751d 100644 --- 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" -- 2.47.3