From: Matan Breizman Date: Mon, 9 Feb 2026 08:50:07 +0000 (+0000) Subject: Revert "crimson/os/seastore/async_cleaner: renew backref cursors when they are" X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08bc486fb8193b52ad8871056af8223289068202;p=ceph.git Revert "crimson/os/seastore/async_cleaner: renew backref cursors when they are" This reverts commit a9c17a2c0912064f51492c2b012cd5608c6a57c1. Signed-off-by: Matan Breizman --- diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index 927e27f41a9..b3c460173c9 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -1154,7 +1154,7 @@ using do_reclaim_space_ertr = base_ertr; using do_reclaim_space_ret = do_reclaim_space_ertr::future<>; do_reclaim_space_ret do_reclaim_space( const std::vector &backref_extents, - backref_mapping_list_t &pin_list, + const backref_mapping_list_t &pin_list, std::size_t &reclaimed, std::size_t &runs, ExtentCallbackInterface &extent_callback, @@ -1215,7 +1215,6 @@ do_reclaim_space_ret do_reclaim_space( backref_manager.get_cached_backref_entries_in_range(start_pos, end_pos); backref_entry_query_set_t backref_entries; for (auto &pin : pin_list) { - pin.renew_cursor(t); backref_entries.emplace( pin.get_key(), pin.get_val(), diff --git a/src/crimson/os/seastore/backref/backref_tree_node.h b/src/crimson/os/seastore/backref/backref_tree_node.h index f8e06129006..2e331146425 100644 --- a/src/crimson/os/seastore/backref/backref_tree_node.h +++ b/src/crimson/os/seastore/backref/backref_tree_node.h @@ -187,17 +187,6 @@ struct BackrefCursor : assert(!is_end()); return iter.get_val().type; } - - BackrefCursor* renew_cursor(Transaction &t) { - auto c = op_context_t{ctx.cache, t}; - t.maybe_add_to_read_set(parent); - return new BackrefCursor( - c, - std::move(parent), - modifications, - std::move(iter)); - } - }; using BackrefCursorRef = boost::intrusive_ptr; diff --git a/src/crimson/os/seastore/backref_mapping.h b/src/crimson/os/seastore/backref_mapping.h index 1d4e78e9b7e..4702ba6095f 100644 --- a/src/crimson/os/seastore/backref_mapping.h +++ b/src/crimson/os/seastore/backref_mapping.h @@ -54,10 +54,6 @@ public: assert(cursor); return cursor->get_type(); } - - void renew_cursor(Transaction &t) { - cursor.reset(cursor->renew_cursor(t)); - } }; using backref_mapping_list_t = std::list;