From e174ece71d1c61285a791deec4b987638ee2e288 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 5 Jul 2024 16:07:02 -0400 Subject: [PATCH] rgw: remove RGWRados::list_lc_progress() it only forwarded to RGWLC::list_lc_progress(), which rgw_admin.cc can now call without casting to RadosStore Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_rados.cc | 7 ------- src/rgw/driver/rados/rgw_rados.h | 3 --- src/rgw/rgw_admin.cc | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index 23c149574ae..42e71d60d3c 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -9292,13 +9292,6 @@ int RGWRados::process_gc(bool expired_only, optional_yield y) return gc->process(expired_only, y); } -int RGWRados::list_lc_progress(string& marker, uint32_t max_entries, - vector>& progress_map, - int& index) -{ - return lc->list_lc_progress(marker, max_entries, progress_map, index); -} - int RGWRados::process_lc(const std::unique_ptr& optional_bucket) { RGWLC lc; diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h index bfae32888f6..df851fad987 100644 --- a/src/rgw/driver/rados/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -1560,9 +1560,6 @@ public: int defer_gc(const DoutPrefixProvider *dpp, RGWObjectCtx* ctx, RGWBucketInfo& bucket_info, const rgw_obj& obj, optional_yield y); int process_lc(const std::unique_ptr& optional_bucket); - int list_lc_progress(std::string& marker, uint32_t max_entries, - std::vector>& progress_map, - int& index); int bucket_check_index(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info, std::map *existing_stats, diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 0008339526b..7397055db2a 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -8825,9 +8825,9 @@ next: if (max_entries < 0) { max_entries = MAX_LC_LIST_ENTRIES; } + RGWLC* lc = driver->get_rgwlc(); do { - int ret = static_cast(driver)->getRados()->list_lc_progress(marker, max_entries, - bucket_lc_map, index); + int ret = lc->list_lc_progress(marker, max_entries, bucket_lc_map, index); if (ret < 0) { cerr << "ERROR: failed to list objs: " << cpp_strerror(-ret) << std::endl; -- 2.39.5