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 <cbodley@redhat.com>

diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
index 23c149574ae9c2dc1ee05d881ef5b5e62baa9eda..42e71d60d3cdb65f67213f51ffcfc067c3a2bf7e 100644 (file)
--- 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<std::unique_ptr<rgw::sal::Lifecycle::LCEntry>>& progress_map,
-                              int& index)
-{
-  return lc->list_lc_progress(marker, max_entries, progress_map, index);
-}
-
 int RGWRados::process_lc(const std::unique_ptr<rgw::sal::Bucket>& optional_bucket)
 {
   RGWLC lc;

diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h
index bfae32888f65f03f9d95d279f63850e55addd342..df851fad9879a72160cf77a4f9837b6998bb780c 100644 (file)
--- 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<rgw::sal::Bucket>& optional_bucket);
-  int list_lc_progress(std::string& marker, uint32_t max_entries,
-                      std::vector<std::unique_ptr<rgw::sal::Lifecycle::LCEntry>>& progress_map,
-                      int& index);
 
   int bucket_check_index(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info,
                          std::map<RGWObjCategory, RGWStorageStats> *existing_stats,

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 0008339526b230b751a6e1dab0630903b566d7e3..7397055db2a374ce44f6366bf3c442193f6836c0 100644 (file)
--- 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<rgw::sal::RadosStore*>(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;