From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 18 Mar 2019 13:23:52 +0000 (+0100)
Subject: rgw_orphan: fix detailed mode flag
X-Git-Tag: v14.2.1~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27560%2Fhead;p=ceph.git

rgw_orphan: fix detailed mode flag

to fix possible member var. hiding

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit c43b7dadfc56868bcaab4bc32cf78612fd5ae0e7)
---

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index dbadd2ddbc7d..567bb93b4fd2 100644
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -186,7 +186,7 @@ int RGWOrphanStore::read_entries(const string& oid, const string& marker, map<st
   return 0;
 }
 
-int RGWOrphanSearch::init(const string& job_name, RGWOrphanSearchInfo *info, bool detailed_mode)
+int RGWOrphanSearch::init(const string& job_name, RGWOrphanSearchInfo *info, bool _detailed_mode)
 {
   int r = orphan_store.init();
   if (r < 0) {
@@ -198,7 +198,7 @@ int RGWOrphanSearch::init(const string& job_name, RGWOrphanSearchInfo *info, boo
   max_list_bucket_entries = std::max(store->ctx()->_conf->rgw_list_bucket_min_readahead,
                                      MAX_LIST_OBJS_ENTRIES);
 
-  detailed_mode = detailed_mode;
+  detailed_mode = _detailed_mode;
   RGWOrphanSearchState state;
   r = orphan_store.read_job(job_name, state);
   if (r < 0 && r != -ENOENT) {
diff --git a/src/rgw/rgw_orphan.h b/src/rgw/rgw_orphan.h
index ffe791c563c5..7d808eeda65d 100644
--- a/src/rgw/rgw_orphan.h
+++ b/src/rgw/rgw_orphan.h
@@ -195,7 +195,7 @@ public:
     return orphan_store.write_job(search_info.job_name, state);
   }
 
-  int init(const string& job_name, RGWOrphanSearchInfo *info, bool detailed_mode=false);
+  int init(const string& job_name, RGWOrphanSearchInfo *info, bool _detailed_mode=false);
 
   int create(const string& job_name, int num_shards);