From: Vedansh Bhartia <vedanshbhartia@gmail.com>
Date: Sun, 16 Jul 2023 05:06:22 +0000 (+0530)
Subject: rgw: Remove logically dead code
X-Git-Tag: v19.0.0~822^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F52436%2Fhead;p=ceph.git

rgw: Remove logically dead code

Signed-off-by: Vedansh Bhartia <vedanshbhartia@gmail.com>
---

diff --git a/src/rgw/driver/rados/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc
index 31eff5312df4..4369bc8a05c8 100644
--- a/src/rgw/driver/rados/rgw_reshard.cc
+++ b/src/rgw/driver/rados/rgw_reshard.cc
@@ -1303,9 +1303,6 @@ int RGWReshard::process_single_logshard(int logshard_num, const DoutPrefixProvid
 
     for(auto& entry: entries) { // logshard entries
       process_entry(entry, max_entries, dpp, y);
-      if (ret < 0) {
-        return ret;
-      }
 
       Clock::time_point now = Clock::now();
       if (logshard_lock.should_renew(now)) {
diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc
index df6330552e75..9886bd5b5909 100644
--- a/src/rgw/rgw_sal_dbstore.cc
+++ b/src/rgw/rgw_sal_dbstore.cc
@@ -1329,7 +1329,6 @@ namespace rgw::sal {
                        rgw_zone_set *zones_trace, bool *canceled,
                        optional_yield y)
   {
-    int ret = 0;
     /* XXX: same as AtomicWriter..consolidate code */
     parent_op.meta.mtime = mtime;
     parent_op.meta.delete_at = delete_at;
@@ -1341,9 +1340,6 @@ namespace rgw::sal {
     /* XXX: handle accounted size */
     accounted_size = total_data_size;
 
-    if (ret < 0)
-      return ret;
-
     RGWUploadPartInfo info;
     info.num = part_num;
     info.etag = etag;
@@ -1354,7 +1350,7 @@ namespace rgw::sal {
 
     DB::Object op_target(store->getDB(),
         meta_obj->get_bucket()->get_info(), meta_obj->get_obj());
-    ret = op_target.add_mp_part(dpp, info);
+    auto ret = op_target.add_mp_part(dpp, info);
     if (ret < 0) {
       return ret == -ENOENT ? -ERR_NO_SUCH_UPLOAD : ret;
     }