rgw: adjust calls

as part of  a rebase work

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

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 090ccbd299b8169b49105fd5ae0105cf651b9870..a8353170d553ada0a347f5d4d83ae08bf8fb7a99 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1128,7 +1128,7 @@ int main(int argc, const char **argv)
   }
   r = rgw_perf_start(g_ceph_context);
 
-  rgw_rest_init(g_ceph_context, store->zonegroup);
+  rgw_rest_init(g_ceph_context, store, store->zonegroup);
 
   mutex.Lock();
   init_timer.cancel_all_events();

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 411c57a0b28659329eaa4fed7bf0f242495a47b0..51294047d9bf1abbefe68e8a6be34f460c9432f3 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -172,9 +172,9 @@ string camelcase_dash_http_attr(const string& orig)
 static set<string> hostnames_set;
 static set<string> hostnames_s3website_set;
 
-void rgw_rest_init(CephContext *cct, RGWZoneGroup& zone_group)
+void rgw_rest_init(CephContext *cct, RGWRados *store, RGWZoneGroup& zone_group)
 {
-  zone_group.store->init_host_id();
+  store->init_host_id();
 
   for (const auto& rgw2http : base_rgw_to_http_attrs)  {
     rgw_to_http_attrs[rgw2http.rgw_attr] = rgw2http.http_attr;

diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h
index 7d89e777d7686771928220612329013fa7ca1251..09f2190556e43eecc57355bcea3d7ac84f39d9f9 100644 (file)
--- a/src/rgw/rgw_rest.h
+++ b/src/rgw/rgw_rest.h
@@ -15,7 +15,7 @@ extern std::map<std::string, std::string> rgw_to_http_attrs;
 
 extern string lowercase_dash_http_attr(const string& orig);
 
-extern void rgw_rest_init(CephContext *cct, RGWZoneGroup& zone_group);
+extern void rgw_rest_init(CephContext *cct, RGWRados *store, RGWZoneGroup& zone_group);
 
 extern void rgw_flush_formatter_and_reset(struct req_state *s,
                                         ceph::Formatter *formatter);