From babbf6720f4d0bc85a924384b245d6bc32262676 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 10 Feb 2016 14:38:40 -0800 Subject: [PATCH] rgw: adjust calls as part of a rebase work Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_main.cc | 2 +- src/rgw/rgw_rest.cc | 4 ++-- src/rgw/rgw_rest.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 090ccbd299b81..a8353170d553a 100644 --- 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 411c57a0b2865..51294047d9bf1 100644 --- 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 hostnames_set; static set 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 7d89e777d7686..09f2190556e43 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -15,7 +15,7 @@ extern std::map 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); -- 2.39.5