From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Thu, 14 Mar 2019 21:26:32 +0000 (+0100)
Subject: cls_rgw: fix issue with gc code using the wrong name
X-Git-Tag: v15.0.0~215^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26564%2Fhead;p=ceph.git

cls_rgw: fix issue with gc code using the wrong name

Also use the correct ptr notation

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 1f57cceeb35..43f74178f2b 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -757,7 +757,7 @@ static void log_entry(const char *func, const char *str, rgw_bucket_olh_entry *e
 
 template <class T>
 static int read_omap_entry(cls_method_context_t hctx, const std::string& name,
-                           T *entry)
+                           T* entry)
 {
   bufferlist current_entry;
   int rc = cls_cxx_map_get_val(hctx, name, &current_entry);
@@ -776,7 +776,7 @@ static int read_omap_entry(cls_method_context_t hctx, const std::string& name,
 }
 
 template <class T>
-static int read_index_entry(cls_method_context_t hctx, string& name, T *entry)
+static int read_index_entry(cls_method_context_t hctx, string& name, T* entry)
 {
   int ret = read_omap_entry(hctx, name, entry);
   if (ret < 0) {
@@ -3179,7 +3179,7 @@ static int gc_omap_get(cls_method_context_t hctx, int type, const string& key, c
   string index;
   prepend_index_prefix(key, type, &index);
 
-  int ret = read_omap_entry(hctx, key, info);
+  int ret = read_omap_entry(hctx, index, info);
   if (ret < 0)
     return ret;