import quincy beta 17.1.0

[ceph.git] / ceph / src / rgw / rgw_auth_registry.h

diff --git a/ceph/src/rgw/rgw_auth_registry.h b/ceph/src/rgw/rgw_auth_registry.h
index a38cb7d6c6d4acdc25b5829d17825cc2fc34425d..35071c54cd334b1c4b665a471487a71708927520 100644 (file)
--- a/ceph/src/rgw/rgw_auth_registry.h
+++ b/ceph/src/rgw/rgw_auth_registry.h
@@ -38,9 +38,9 @@ class StrategyRegistry {
 
     s3_main_strategy_t(CephContext* const cct,
                       ImplicitTenants& implicit_tenant_context,
-                      RGWCtl* const ctl)
-      : s3_main_strategy_plain(cct, implicit_tenant_context, ctl),
-        s3_main_strategy_boto2(cct, implicit_tenant_context, ctl) {
+                      rgw::sal::Store* store)
+      : s3_main_strategy_plain(cct, implicit_tenant_context, store),
+        s3_main_strategy_boto2(cct, implicit_tenant_context, store) {
       add_engine(Strategy::Control::SUFFICIENT, s3_main_strategy_plain);
       add_engine(Strategy::Control::FALLBACK, s3_main_strategy_boto2);
     }
@@ -61,11 +61,11 @@ class StrategyRegistry {
 public:
   StrategyRegistry(CephContext* const cct,
                    ImplicitTenants& implicit_tenant_context,
-                   RGWCtl* const ctl)
-    : s3_main_strategy(cct, implicit_tenant_context, ctl),
-      s3_post_strategy(cct, implicit_tenant_context, ctl),
-      swift_strategy(cct, implicit_tenant_context, ctl),
-      sts_strategy(cct, implicit_tenant_context, ctl) {
+                   rgw::sal::Store* store)
+    : s3_main_strategy(cct, implicit_tenant_context, store),
+      s3_post_strategy(cct, implicit_tenant_context, store),
+      swift_strategy(cct, implicit_tenant_context, store),
+      sts_strategy(cct, implicit_tenant_context, store) {
   }
 
   const s3_main_strategy_t& get_s3_main() const {
@@ -87,8 +87,8 @@ public:
   static std::shared_ptr<StrategyRegistry>
   create(CephContext* const cct,
          ImplicitTenants& implicit_tenant_context,
-         RGWCtl* const ctl) {
-    return std::make_shared<StrategyRegistry>(cct, implicit_tenant_context, ctl);
+         rgw::sal::Store* store) {
+    return std::make_shared<StrategyRegistry>(cct, implicit_tenant_context, store);
   }
 };