From: Matan Breizman Date: Mon, 9 Feb 2026 08:50:21 +0000 (+0000) Subject: Revert "crimson/os/seastore/lba_manager: make sure alloc_extents return viewable" X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27321d6c21ea15e246c3785ca606497e3ace1fb4;p=ceph.git Revert "crimson/os/seastore/lba_manager: make sure alloc_extents return viewable" This reverts commit e6fd2e87a18ed25845e5ba5f6d03ebb20818e583. Signed-off-by: Matan Breizman --- diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc index 57b92ef6643..9d8ba487130 100644 --- a/src/crimson/os/seastore/lba/btree_lba_manager.cc +++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc @@ -684,12 +684,12 @@ BtreeLBAManager::insert_mappings( return trans_intr::do_for_each( alloc_infos.begin(), alloc_infos.end(), - [c, &btree, &iter](auto &info) + [c, &btree, &iter, &ret](auto &info) { assert(info.key != L_ADDR_NULL); return btree.insert( c, iter, info.key, info.value - ).si_then([c, &iter, &info](auto p) { + ).si_then([c, &iter, &ret, &info](auto p) { ceph_assert(p.second); iter = std::move(p.first); auto &leaf_node = *iter.get_leaf_node(); @@ -716,20 +716,11 @@ BtreeLBAManager::insert_mappings( info.extent->set_laddr(iter.get_key()); } } + ret.push_back(iter.get_cursor(c)); return iter.next(c).si_then([&iter](auto p) { iter = std::move(p); }); }); - }).si_then([&ret, &iter, alloc_infos, c] { - return trans_intr::do_for_each( - boost::make_counting_iterator(0), - boost::make_counting_iterator(alloc_infos.size()), - [&ret, &iter, c](auto) { - return iter.prev(c).si_then([c, &ret, &iter](auto it) { - ret.push_front(it.get_cursor(c)); - iter = std::move(it); - }); - }); }).si_then([&ret] { return alloc_mappings_iertr::make_ready_future< std::list>(std::move(ret));