update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rgw / services / svc_user_rados.h

diff --git a/ceph/src/rgw/services/svc_user_rados.h b/ceph/src/rgw/services/svc_user_rados.h
index 3ab69b0355d1d3805dcf94841e87e36f86b9b9d7..177f720d6b18bc0643576b0f39bdacb3496d8653 100644 (file)
--- a/ceph/src/rgw/services/svc_user_rados.h
+++ b/ceph/src/rgw/services/svc_user_rados.h
@@ -16,10 +16,11 @@
 
 #pragma once
 
-#include "rgw/rgw_service.h"
+#include "rgw_service.h"
 
 #include "svc_meta_be.h"
 #include "svc_user.h"
+#include "rgw_bucket.h"
 
 class RGWSI_RADOS;
 class RGWSI_Zone;
@@ -31,8 +32,6 @@ class RGWSI_MetaBackend_Handler;
 
 struct rgw_cache_entry_info;
 
-class RGWUserBuckets;
-
 class RGWGetUserHeader_CB;
 class RGWGetUserStats_CB;
 
@@ -69,9 +68,9 @@ class RGWSI_User_RADOS : public RGWSI_User
   int remove_uid_index(RGWSI_MetaBackend::Context *ctx, const RGWUserInfo& user_info, RGWObjVersionTracker *objv_tracker,
                        optional_yield y, const DoutPrefixProvider *dpp);
 
-  int remove_key_index(const DoutPrefixProvider *dpp, RGWSI_MetaBackend::Context *ctx, const RGWAccessKey& access_key, optional_yield y);
-  int remove_email_index(const DoutPrefixProvider *dpp, RGWSI_MetaBackend::Context *ctx, const std::string& email, optional_yield y);
-  int remove_swift_name_index(const DoutPrefixProvider *dpp, RGWSI_MetaBackend::Context *ctx, const std::string& swift_name, optional_yield y);
+  int remove_key_index(const DoutPrefixProvider *dpp, const RGWAccessKey& access_key, optional_yield y);
+  int remove_email_index(const DoutPrefixProvider *dpp, const std::string& email, optional_yield y);
+  int remove_swift_name_index(const DoutPrefixProvider *dpp, const std::string& swift_name, optional_yield y);
 
   /* admin management */
   int cls_user_update_buckets(const DoutPrefixProvider *dpp, rgw_raw_obj& obj, std::list<cls_user_bucket_entry>& entries, bool add, optional_yield y);
@@ -171,18 +170,15 @@ public:
   /* user buckets directory */
 
   int add_bucket(const DoutPrefixProvider *dpp, 
-                 RGWSI_MetaBackend::Context *ctx,
                  const rgw_user& user,
                  const rgw_bucket& bucket,
                  ceph::real_time creation_time,
                  optional_yield y) override;
   int remove_bucket(const DoutPrefixProvider *dpp, 
-                    RGWSI_MetaBackend::Context *ctx,
                     const rgw_user& user,
                     const rgw_bucket& _bucket,
                     optional_yield y) override;
   int list_buckets(const DoutPrefixProvider *dpp, 
-                   RGWSI_MetaBackend::Context *ctx,
                    const rgw_user& user,
                    const std::string& marker,
                    const std::string& end_marker,
@@ -193,16 +189,13 @@ public:
 
   /* quota related */
   int flush_bucket_stats(const DoutPrefixProvider *dpp, 
-                         RGWSI_MetaBackend::Context *ctx,
                          const rgw_user& user,
                          const RGWBucketEnt& ent, optional_yield y) override;
 
   int complete_flush_stats(const DoutPrefixProvider *dpp, 
-                           RGWSI_MetaBackend::Context *ctx,
                           const rgw_user& user, optional_yield y) override;
 
   int reset_bucket_stats(const DoutPrefixProvider *dpp, 
-                         RGWSI_MetaBackend::Context *ctx,
                         const rgw_user& user,
                          optional_yield y) override;
   int read_stats(const DoutPrefixProvider *dpp, 
@@ -212,7 +205,7 @@ public:
                 ceph::real_time *last_stats_update,
                  optional_yield y) override;  /* last time a stats update was done */
 
-  int read_stats_async(const DoutPrefixProvider *dpp, RGWSI_MetaBackend::Context *ctx,
-                      const rgw_user& user, RGWGetUserStats_CB *cb) override;
+  int read_stats_async(const DoutPrefixProvider *dpp, const rgw_user& user,
+                       RGWGetUserStats_CB *cb) override;
 };