update ceph source to reef 18.1.2

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

diff --git a/ceph/src/rgw/rgw_rest_config.h b/ceph/src/rgw/rgw_rest_config.h
index f79f811dd534e4c94d24bfeca256270c0d42cdd9..1910cbe0bc7ac7bbdb680ea5bd146635814739f5 100644 (file)
--- a/ceph/src/rgw/rgw_rest_config.h
+++ b/ceph/src/rgw/rgw_rest_config.h
@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 /*
@@ -19,30 +19,6 @@
 #include "rgw_rest.h"
 #include "rgw_zone.h"
 
-class RGWOp_ZoneGroupMap_Get : public RGWRESTOp {
-  RGWZoneGroupMap zonegroup_map;
-  bool old_format;
-public:
-  explicit RGWOp_ZoneGroupMap_Get(bool _old_format):old_format(_old_format) {}
-  ~RGWOp_ZoneGroupMap_Get() override {}
-
-  int check_caps(const RGWUserCaps& caps) override {
-    return caps.check_cap("zone", RGW_CAP_READ);
-  }
-  int verify_permission(optional_yield) override {
-    return check_caps(s->user->get_caps());
-  }
-  void execute(optional_yield y) override;
-  void send_response() override;
-  const char* name() const override {
-    if (old_format) {
-      return "get_region_map";
-    } else {
-      return "get_zonegroup_map";
-    }
-  }
-};
-
 class RGWOp_ZoneConfig_Get : public RGWRESTOp {
   RGWZoneParams zone_params;
 public:
@@ -54,7 +30,7 @@ public:
   int verify_permission(optional_yield) override {
     return check_caps(s->user->get_caps());
   }
-  void execute(optional_yield) override {} /* store already has the info we need, just need to send response */
+  void execute(optional_yield) override {} /* driver already has the info we need, just need to send response */
   void send_response() override ;
   const char* name() const override {
     return "get_zone_config";
@@ -79,8 +55,8 @@ public:
   RGWRESTMgr_Config() = default;
   ~RGWRESTMgr_Config() override = default;
 
-  RGWHandler_REST* get_handler(rgw::sal::Store* ,
-                              struct req_state*,
+  RGWHandler_REST* get_handler(rgw::sal::Driver* ,
+                              req_state*,
                                const rgw::auth::StrategyRegistry& auth_registry,
                                const std::string&) override {
     return new RGWHandler_Config(auth_registry);