crimson/.../btree_lba_manager: remove update_refcount, simplify _update_mapping retur...

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 0f5b06d55b4673ea90ce52b4abe3743afd4919cc..2e2895c19d91258eb5a0b4f245fdf9a1a8158873 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -853,43 +853,6 @@ void BtreeLBAManager::register_metrics()
   );
 }
 
-BtreeLBAManager::update_refcount_ret
-BtreeLBAManager::update_refcount(
-  Transaction &t,
-  std::variant<laddr_t, LBACursor*> addr_or_cursor,
-  int delta)
-{
-  auto addr = addr_or_cursor.index() == 0
-    ? std::get<0>(addr_or_cursor)
-    : std::get<1>(addr_or_cursor)->key;
-  LOG_PREFIX(BtreeLBAManager::update_refcount);
-  TRACET("laddr={}, delta={}", t, addr, delta);
-  auto fut = _update_mapping_iertr::make_ready_future<
-    update_mapping_ret_bare_t>();
-  auto update_func =
-    [delta](const lba_map_val_t &in) {
-      lba_map_val_t out = in;
-      ceph_assert((int)out.refcount + delta >= 0);
-      out.refcount += delta;
-      return out;
-    };
-  if (addr_or_cursor.index() == 0) {
-    fut = _update_mapping(t, addr, std::move(update_func), nullptr);
-  } else {
-    auto &cursor = std::get<1>(addr_or_cursor);
-    fut = _update_mapping(t, *cursor, std::move(update_func), nullptr);
-  }
-  return fut.si_then([delta, &t, addr, FNAME, this](auto res) {
-    DEBUGT("laddr={}, delta={} done -- {}",
-          t, addr, delta,
-          res.is_alive_mapping()
-            ? res.get_cursor().val
-            : res.get_removed_mapping().map_value);
-    return update_mapping_iertr::make_ready_future<
-      mapping_update_result_t>(get_mapping_update_result(res));
-  });
-}
-
 BtreeLBAManager::_update_mapping_ret
 BtreeLBAManager::_update_mapping(
   Transaction &t,
@@ -936,60 +899,6 @@ BtreeLBAManager::_update_mapping(
   });
 }
 
-BtreeLBAManager::_update_mapping_ret
-BtreeLBAManager::_update_mapping(
-  Transaction &t,
-  laddr_t addr,
-  update_func_t &&f,
-  LogicalChildNode* nextent)
-{
-  auto c = get_context(t);
-  return with_btree<LBABtree>(
-    cache,
-    c,
-    [f=std::move(f), c, addr, nextent](auto &btree) mutable {
-      return btree.lower_bound(
-       c, addr
-      ).si_then([&btree, f=std::move(f), c, addr, nextent](auto iter)
-               -> _update_mapping_ret {
-       if (iter.is_end() || iter.get_key() != addr) {
-         LOG_PREFIX(BtreeLBAManager::_update_mapping);
-         ERRORT("laddr={} doesn't exist", c.trans, addr);
-         return crimson::ct_error::enoent::make();
-       }
-
-       auto ret = f(iter.get_val());
-       if (ret.refcount == 0) {
-         assert(nextent == nullptr);
-         return btree.remove(
-           c,
-           iter
-         ).si_then([addr, ret, c](auto iter) {
-           return update_mapping_ret_bare_t(addr, ret, iter.get_cursor(c));
-         });
-       } else {
-         return btree.update(
-           c,
-           iter,
-           ret
-         ).si_then([c, nextent](auto iter) {
-           if (nextent) {
-             // nextent is provided iff unlinked,
-              // also see TM::rewrite_logical_extent()
-             assert(!nextent->has_parent_tracker());
-             iter.get_leaf_node()->update_child_ptr(
-               iter.get_leaf_pos(), nextent);
-           }
-           assert(!nextent || 
-                  (nextent->has_parent_tracker() &&
-                   nextent->peek_parent_node().get() == iter.get_leaf_node().get()));
-           return update_mapping_ret_bare_t(iter.get_cursor(c));
-         });
-       }
-      });
-    });
-}
-
 BtreeLBAManager::get_cursor_ret
 BtreeLBAManager::get_containing_cursor(
   op_context_t c,

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.h b/src/crimson/os/seastore/lba/btree_lba_manager.h
index 9cd41cef08caf075dc79e9f82283fc083cd6a6d3..522e3419be7c9a12e5594ea9899b6523bda11269 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.h
@@ -181,15 +181,19 @@ public:
     Transaction &t,
     LBACursorRef cursor,
     int delta) final {
-    auto result = co_await update_refcount(t, cursor.get(), delta
+    co_return (co_await _update_mapping(
+      t,
+      *cursor,
+      [delta](lba_map_val_t ret) {
+       ceph_assert((int)ret.refcount + delta >= 0);
+       ret.refcount += delta;
+       return ret;
+      },
+      nullptr
     ).handle_error_interruptible(
       base_iertr::pass_further{},
-      /* ENOENT in particular should be impossible */
-      crimson::ct_error::assert_all{
-       "Invalid enoent in BtreeLBAManager::incref_extent"
-      }
-    );
-    co_return result.mapping.direct_cursor;
+      crimson::ct_error::assert_all{}
+    )).take_cursor();
   }
 
   remap_ret remap_mappings(
@@ -380,14 +384,6 @@ private:
     }
   }
 
-  using update_refcount_iertr = ref_iertr;
-  using update_refcount_ret = update_refcount_iertr::future<
-    mapping_update_result_t>;
-  update_refcount_ret update_refcount(
-    Transaction &t,
-    std::variant<laddr_t, LBACursor*> addr_or_cursor,
-    int delta);
-
   /**
    * _update_mapping
    *
@@ -399,11 +395,6 @@ private:
   using update_func_t = std::function<
     lba_map_val_t(const lba_map_val_t &v)
     >;
-  _update_mapping_ret _update_mapping(
-    Transaction &t,
-    laddr_t addr,
-    update_func_t &&f,
-    LogicalChildNode*);
   _update_mapping_ret _update_mapping(
     Transaction &t,
     LBACursor &cursor,