crimson/.../btree_lba_manager: convert get_end_mapping to return LBACursorRef

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc
index b9274679d26a33712111a3e8037cc2561293876b..2c5fcb7506817f45bdac30901594a5a19f7e11a4 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -1134,7 +1134,7 @@ BtreeLBAManager::get_end_mapping(
   auto c = get_context(t);
   auto btree = co_await get_btree<LBABtree>(cache, c);
   auto iter = co_await btree.end(c);
-  co_return LBAMapping::create_direct(iter.get_cursor(c));
+  co_return iter.get_cursor(c);
 }
 #endif
 

diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h
index a4c001eb9d3ba9ab0335c55a88b5f80bfbdb96d1..0ec0c58c140fd94f7f0fe47963511c003b5107e2 100644 (file)
--- a/src/crimson/os/seastore/lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager.h
@@ -57,7 +57,7 @@ public:
 
 #ifdef UNIT_TESTS_BUILT
   using get_end_mapping_iertr = base_iertr;
-  using get_end_mapping_ret = get_end_mapping_iertr::future<LBAMapping>;
+  using get_end_mapping_ret = get_end_mapping_iertr::future<LBACursorRef>;
   virtual get_end_mapping_ret get_end_mapping(Transaction &t) = 0;
 #endif
 

diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc
index 137dbe0d0d18a402d5128197e4dace00f3df9a1f..ffd8ea55c158cfd6bdb025f1f2214d2ccecc4e02 100644 (file)
--- a/src/test/crimson/seastore/test_transaction_manager.cc
+++ b/src/test/crimson/seastore/test_transaction_manager.cc
@@ -726,9 +726,9 @@ struct transaction_manager_test_t :
   }
 
   LBAMapping get_end(test_transaction_t &t) {
-    return with_trans_intr(*(t.t), [&](auto &trans) {
+    return LBAMapping::create_direct(with_trans_intr(*(t.t), [&](auto &trans) {
       return lba_manager->get_end_mapping(trans);
-    }).unsafe_get();
+    }).unsafe_get());
   }
 
   std::optional<LBAMapping> try_get_pin(