From: Marcus Watts <mwatts@redhat.com>
Date: Thu, 26 Aug 2021 09:08:00 +0000 (-0400)
Subject: rgw: remove unused routine in rgw_admin
X-Git-Tag: v19.0.0~1192^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d96cee3772c77da0ee082099a313171306fcc027;p=ceph.git

rgw: remove unused routine in rgw_admin

Routine "dump_bi_entry" contains logic to decode rgw_bucket_dir_entry
which can contain etags to be fixed.  However, it turns out this
routine is never called, so let's just get rid of it.  (The replacement
code lives in cls land.)

Fixes: https://tracker.ceph.com/issues/61260

Signed-off-by: Marcus Watts <mwatts@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 228e165647f5..a0a6d95beddc 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1100,31 +1100,6 @@ log_type get_log_type(const string& type_str) {
   return static_cast<log_type>(0xff);
 }
 
-void dump_bi_entry(bufferlist& bl, BIIndexType index_type, Formatter *formatter)
-{
-  auto iter = bl.cbegin();
-  switch (index_type) {
-    case BIIndexType::Plain:
-    case BIIndexType::Instance:
-      {
-        rgw_bucket_dir_entry entry;
-        decode(entry, iter);
-        encode_json("entry", entry, formatter);
-      }
-      break;
-    case BIIndexType::OLH:
-      {
-        rgw_bucket_olh_entry entry;
-        decode(entry, iter);
-        encode_json("entry", entry, formatter);
-      }
-      break;
-    default:
-      ceph_abort();
-      break;
-  }
-}
-
 static void show_user_info(RGWUserInfo& info, Formatter *formatter)
 {
   encode_json("user_info", info, formatter);