From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 7 Sep 2018 12:03:21 +0000 (-0700)
Subject: rgw: minor adjustments
X-Git-Tag: v14.1.0~965^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f9375cbbe208a4a2d7a22fd47fc2863fdae71c2;p=ceph.git

rgw: minor adjustments

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index c9808400a46..dc01a91c38c 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -513,7 +513,7 @@ namespace rgw {
 
     r = rgw_perf_start(g_ceph_context);
 
-    rgw_rest_init(g_ceph_context, store, store->get_zonegroup());
+    rgw_rest_init(g_ceph_context, store, store->svc.zone->get_zonegroup());
 
     mutex.Lock();
     init_timer.cancel_all_events();
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 702f9504f6b..3db89306e69 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -1286,7 +1286,7 @@ namespace rgw {
     struct req_state* s = get_state();
 
     auto compression_type =
-      get_store()->get_zone_params().get_compression_type(
+      get_store()->svc.zone->get_zone_params().get_compression_type(
 	s->bucket_info.placement_rule);
 
     /* not obviously supportable */