Merge pull request #16690 from scienceluo/wip-luo-unused-var-branch

common/rgw/rbd: remove some unused variables

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/common/options.cc
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_bucket.cc
index 62f37ced2017c55258abab280c606b89df76f556,2c934506fa8e4bdf71f0e181c493da6fc7b82834..41b7d12315066a5ffd7188bd4a9e275e6806069c
--- 1/src/rgw/rgw_bucket.cc
--- 2/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -1323,10 -1309,9 +1323,9 @@@ int RGWBucketAdminOp::check_index(RGWRa
                    RGWFormatterFlusher& flusher)
  {
    int ret;
-   map<string, rgw_bucket_dir_entry> result;
    map<RGWObjCategory, RGWStorageStats> existing_stats;
    map<RGWObjCategory, RGWStorageStats> calculated_stats;
 -  list<rgw_obj_index_key> objs_to_unlink;
 +
  
    RGWBucket bucket;
  

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge