From: Seena Fallah Date: Sat, 19 Apr 2025 21:24:53 +0000 (+0200) Subject: rgw: remove unused ret var in datalog trim_entries X-Git-Tag: testing/wip-rishabh-testing-20250426.123842-debug~30^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3786bf84c553b41935135bdc4c7a32a91bc1fd82;p=ceph-ci.git rgw: remove unused ret var in datalog trim_entries Signed-off-by: Seena Fallah --- diff --git a/src/rgw/driver/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc index d6ed19f20b4..6cf00adc73e 100644 --- a/src/rgw/driver/rados/rgw_datalog.cc +++ b/src/rgw/driver/rados/rgw_datalog.cc @@ -1260,26 +1260,23 @@ asio::awaitable DataLogBackends::trim_entries( { auto [target_gen, cursor] = cursorgen(std::string{marker}); std::unique_lock l(m); + const auto head_gen = (end() - 1)->second->gen_id; const auto tail_gen = begin()->first; - if (target_gen < tail_gen) - + if (target_gen < tail_gen) co_return; - auto r = 0; + for (auto be = lower_bound(0)->second; - be->gen_id <= target_gen && be->gen_id <= head_gen && r >= 0; + be->gen_id <= target_gen && be->gen_id <= head_gen; be = upper_bound(be->gen_id)->second) { l.unlock(); auto c = be->gen_id == target_gen ? cursor : be->max_marker(); co_await be->trim(dpp, shard_id, c); - if (r == -ENOENT) - r = -ENODATA; - if (r == -ENODATA && be->gen_id < target_gen) - r = 0; if (be->gen_id == target_gen) break; l.lock(); }; + co_return; }