update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/rgw/rgw_rest_config.cc b/ceph/src/rgw/rgw_rest_config.cc
index 3770cec15dedeaea04cbaa93cafeab69fedae63f..e5b863d034b94e5bab0cd5af26da67e203ce6fad 100644 (file)
--- a/ceph/src/rgw/rgw_rest_config.cc
+++ b/ceph/src/rgw/rgw_rest_config.cc
@@ -1,5 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
 // vim: ts=8 sw=2 smarttab
+
 /*
  * Ceph - scalable distributed file system
  *
@@ -11,6 +12,7 @@
  * Foundation. See file COPYING.
  *
  */
+
 #include "common/ceph_json.h"
 #include "common/strtol.h"
 #include "rgw_rest.h"
@@ -20,13 +22,15 @@
 #include "rgw_rest_config.h"
 #include "rgw_client_io.h"
 #include "common/errno.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
+
+#include "services/svc_zone.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
 
 void RGWOp_ZoneGroupMap_Get::execute() {
-  http_ret = zonegroup_map.read(g_ceph_context, store);
+  http_ret = zonegroup_map.read(g_ceph_context, store->svc.sysobj);
   if (http_ret < 0) {
     dout(5) << "failed to read zone_group map" << dendl;
   }
@@ -54,7 +58,7 @@ void RGWOp_ZoneGroupMap_Get::send_response() {
 }
 
 void RGWOp_ZoneConfig_Get::send_response() {
-  const RGWZoneParams& zone_params = store->get_zone_params();
+  const RGWZoneParams& zone_params = store->svc.zone->get_zone_params();
 
   set_req_state_err(s, http_ret);
   dump_errno(s);