]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_orphan: fix detailed mode flag 26412/head
authorAbhishek Lekshmanan <abhishek@suse.com>
Mon, 18 Mar 2019 13:23:52 +0000 (14:23 +0100)
committerAbhishek Lekshmanan <abhishek@suse.com>
Mon, 18 Mar 2019 13:23:52 +0000 (14:23 +0100)
to fix possible member var. hiding

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
src/rgw/rgw_orphan.cc
src/rgw/rgw_orphan.h

index dbadd2ddbc7dde36d5b3ff7669b1167f012d526d..567bb93b4fd2eee160890b38d10077468cb6a640 100644 (file)
@@ -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) {
index ffe791c563c5ccc9f13f9b64841372fc73e2802c..7d808eeda65d3ddc786effc48259881c45349871 100644 (file)
@@ -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);