From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 11 Feb 2016 23:35:30 +0000 (-0800)
Subject: rgw: adjust interfaces following rebase
X-Git-Tag: v10.1.0~354^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=447c80611a7e8160cdb7969be4feebdab620558b;p=ceph.git

rgw: adjust interfaces following rebase

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 97a564c66695..3e2be9a37956 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1490,12 +1490,12 @@ static int update_period(const string& realm_id, const string& realm_name,
   return 0;
 }
 
-static int init_bucket_for_sync(const string& bucket_name, string& bucket_id)
+static int init_bucket_for_sync(const string& tenant, const string& bucket_name, string& bucket_id)
 {
   RGWBucketInfo bucket_info;
   rgw_bucket bucket;
 
-  int ret = init_bucket(bucket_name, bucket_id, bucket_info, bucket);
+  int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket);
   if (ret == -ENOENT) {
     if (bucket_id.empty()) {
       cerr << "ERROR: bucket id specified" << std::endl;
@@ -4654,7 +4654,7 @@ next:
       cerr << "ERROR: bucket not specified" << std::endl;
       return EINVAL;
     }
-    int ret = init_bucket_for_sync(bucket_name, bucket_id);
+    int ret = init_bucket_for_sync(tenant, bucket_name, bucket_id);
     if (ret < 0) {
       return -ret;
     }
@@ -4681,7 +4681,7 @@ next:
       cerr << "ERROR: bucket not specified" << std::endl;
       return EINVAL;
     }
-    int ret = init_bucket_for_sync(bucket_name, bucket_id);
+    int ret = init_bucket_for_sync(tenant, bucket_name, bucket_id);
     if (ret < 0) {
       return -ret;
     }
@@ -4713,7 +4713,7 @@ next:
       cerr << "ERROR: bucket not specified" << std::endl;
       return EINVAL;
     }
-    int ret = init_bucket_for_sync(bucket_name, bucket_id);
+    int ret = init_bucket_for_sync(tenant, bucket_name, bucket_id);
     if (ret < 0) {
       return -ret;
     }
diff --git a/src/rgw/rgw_realm_reloader.cc b/src/rgw/rgw_realm_reloader.cc
index f0d5771c338b..a565b09f7fba 100644
--- a/src/rgw/rgw_realm_reloader.cc
+++ b/src/rgw/rgw_realm_reloader.cc
@@ -138,7 +138,7 @@ void RGWRealmReloader::reload()
   ldout(cct, 1) << "Finishing initialization of new store" << dendl;
   // finish initializing the new store
   ldout(cct, 1) << " - REST subsystem init" << dendl;
-  rgw_rest_init(cct, store->get_zonegroup());
+  rgw_rest_init(cct, store, store->get_zonegroup());
   ldout(cct, 1) << " - user subsystem init" << dendl;
   rgw_user_init(store);
   ldout(cct, 1) << " - user subsystem init" << dendl;