From f1c7c629f2a7baf87a3d25d68b7a40fb3b2f6c49 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 29 Jun 2015 15:35:04 -0700
Subject: [PATCH] rgw: api adjustment following a rebase

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 7cf1f376e7dbc98a44f4a8e78bfa11f84291a941)
---
 src/rgw/rgw_orphan.cc | 6 +++---
 src/rgw/rgw_rados.h   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index 257dd8074f395..2818d79fc38e4 100644
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -112,7 +112,7 @@ int RGWOrphanStore::remove_job(const string& job_name)
 int RGWOrphanStore::init()
 {
   const char *log_pool = store->get_zone_params().log_pool.name.c_str();
-  librados::Rados *rados = store->get_rados();
+  librados::Rados *rados = store->get_rados_handle();
   int r = rados->ioctx_create(log_pool, ioctx);
   if (r < 0) {
     cerr << "ERROR: failed to open log pool (" << store->get_zone_params().log_pool.name << " ret=" << r << std::endl;
@@ -251,7 +251,7 @@ int RGWOrphanSearch::log_oids(map<int, string>& log_shards, map<int, list<string
 
 int RGWOrphanSearch::build_all_oids_index()
 {
-  librados::Rados *rados = store->get_rados();
+  librados::Rados *rados = store->get_rados_handle();
 
   librados::IoCtx ioctx;
 
@@ -623,7 +623,7 @@ int RGWOrphanSearch::compare_oid_indexes()
 
   librados::IoCtx data_ioctx;
 
-  librados::Rados *rados = store->get_rados();
+  librados::Rados *rados = store->get_rados_handle();
 
   int ret = rados->ioctx_create(search_info.pool.c_str(), data_ioctx);
   if (ret < 0) {
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 302124ac9d42a..08a6896fb164c 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1271,8 +1271,6 @@ public:
                rest_master_conn(NULL),
                meta_mgr(NULL), data_log(NULL) {}
 
-  librados::Rados *get_rados() { return rados; }
-
   uint64_t get_new_req_id() {
     return max_req_id.inc();
   }
@@ -2124,6 +2122,8 @@ public:
     return zone_public_config.log_meta;
   }
 
+  librados::Rados* get_rados_handle();
+
  private:
   /**
    * This is a helper method, it generates a list of bucket index objects with the given
@@ -2196,8 +2196,6 @@ public:
 
   uint64_t instance_id();
   uint64_t next_bucket_id();
-
-  librados::Rados* get_rados_handle();
 };
 
 class RGWStoreManager {
-- 
2.39.5