crimson/.../transaction_manager: convert remove to use cursor interfaces

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

diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index 2c43c2f8f2acbfc27466dbeb5660cfc2b50b8977..e9cd605597ce485fec6ec01f6245a7f2d2760a78 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -206,17 +206,22 @@ TransactionManager::ref_ret TransactionManager::remove(
 {
   LOG_PREFIX(TransactionManager::remove);
   DEBUGT("{} ...", t, *ref);
-  auto mapping = co_await lba_manager->get_mapping(t, *ref);
-  auto result = co_await lba_manager->remove_mapping(t, std::move(mapping));
-  assert(!result.direct_result);
-  auto &primary_result = result.result;
-  if (primary_result.refcount == 0) {
+  auto cursor = co_await lba_manager->get_cursor(t, *ref);
+  assert(cursor->is_direct());
+  extent_ref_count_t refcount = cursor->get_refcount();
+  auto laddr = cursor->get_laddr();
+  auto length = cursor->get_length();
+  assert(refcount > 0);
+  --refcount;
+  co_await lba_manager->update_mapping_refcount(
+    t, std::move(cursor), -1);
+  if (refcount == 0) {
     cache->retire_extent(t, ref);
   }
   DEBUGT("removed {}~0x{:x} refcount={} -- {}",
-        t, primary_result.addr, primary_result.length,
-        primary_result.refcount, *ref);
-  co_return primary_result.refcount;
+        t, laddr, length,
+        refcount, *ref);
+  co_return refcount;
 }
 
 TransactionManager::ref_ret TransactionManager::remove(