1 files changed, 11 insertions, 13 deletions

diff --git a/src/rgw/services/svc_bi_rados.h b/src/rgw/services/svc_bi_rados.h
index feba0cfcd19..c6c11f8bc00 100644
--- a/src/rgw/services/svc_bi_rados.h
+++ b/src/rgw/services/svc_bi_rados.h
@@ -21,7 +21,6 @@
 #include "rgw_tools.h"
 
 #include "svc_bi.h"
-#include "svc_rados.h"
 #include "svc_tier_rados.h"
 
 struct rgw_bucket_dir_header;
@@ -45,15 +44,15 @@ class RGWSI_BucketIndex_RADOS : public RGWSI_BucketIndex
 
   int open_pool(const DoutPrefixProvider *dpp,
                 const rgw_pool& pool,
-                RGWSI_RADOS::Pool *index_pool,
+                librados::IoCtx* index_pool,
                 bool mostly_omap);
 
   int open_bucket_index_pool(const DoutPrefixProvider *dpp,
-                            const RGWBucketInfo& bucket_info,
-                            RGWSI_RADOS::Pool *index_pool);
+			     const RGWBucketInfo& bucket_info,
+			     librados::IoCtx* index_pool);
   int open_bucket_index_base(const DoutPrefixProvider *dpp,
                              const RGWBucketInfo& bucket_info,
-                             RGWSI_RADOS::Pool *index_pool,
+                             librados::IoCtx* index_pool,
                              std::string *bucket_oid_base);
 
   // return the index oid for the given shard id
@@ -77,9 +76,10 @@ class RGWSI_BucketIndex_RADOS : public RGWSI_BucketIndex
 
 public:
 
+  librados::Rados* rados{nullptr};
+
   struct Svc {
     RGWSI_Zone *zone{nullptr};
-    RGWSI_RADOS *rados{nullptr};
     RGWSI_BILog_RADOS *bilog{nullptr};
     RGWDataChangesLog *datalog_rados{nullptr};
   } svc;
@@ -87,7 +87,7 @@ public:
   RGWSI_BucketIndex_RADOS(CephContext *cct);
 
   void init(RGWSI_Zone *zone_svc,
-            RGWSI_RADOS *rados_svc,
+            librados::Rados* rados_,
             RGWSI_BILog_RADOS *bilog_svc,
             RGWDataChangesLog *datalog_rados_svc);
 
@@ -141,26 +141,24 @@ public:
   int open_bucket_index_shard(const DoutPrefixProvider *dpp,
                               const RGWBucketInfo& bucket_info,
                               const std::string& obj_key,
-                              RGWSI_RADOS::Obj *bucket_obj,
+                              rgw_rados_ref* bucket_obj,
                               int *shard_id);
 
   int open_bucket_index_shard(const DoutPrefixProvider *dpp,
                               const RGWBucketInfo& bucket_info,
                               const rgw::bucket_index_layout_generation& index,
-                              int shard_id, RGWSI_RADOS::Obj *bucket_obj);
+                              int shard_id, rgw_rados_ref* bucket_obj);
 
   int open_bucket_index(const DoutPrefixProvider *dpp,
                         const RGWBucketInfo& bucket_info,
-                        RGWSI_RADOS::Pool *index_pool,
+                        librados::IoCtx* index_pool,
                         std::string *bucket_oid);
 
   int open_bucket_index(const DoutPrefixProvider *dpp,
                         const RGWBucketInfo& bucket_info,
                         std::optional<int> shard_id,
                         const rgw::bucket_index_layout_generation& idx_layout,
-                        RGWSI_RADOS::Pool *index_pool,
+                        librados::IoCtx* index_pool,
                         std::map<int, std::string> *bucket_objs,
                         std::map<int, std::string> *bucket_instance_ids);
 };
-
-