crimson/os/seastore/FixedKVBtree: remove with_btree_ret helper function

Signed-off-by: Zhang Song <zhangsong02@qianxin.com>
(cherry picked from commit 725ec09ee5eead3893cd43ba8706d0836399ca2f)

diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc
index bf70daa81f66dc5c8cdf9e7861b17cb4127acee0..58b4ffd4c9a84fed63f691046647102fa7862928 100644 (file)
--- a/src/crimson/os/seastore/backref/btree_backref_manager.cc
+++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc
@@ -91,7 +91,7 @@ BtreeBackrefManager::get_mapping(
   LOG_PREFIX(BtreeBackrefManager::get_mapping);
   TRACET("{}", t, offset);
   auto c = get_context(t);
-  return with_btree_ret<BackrefBtree, BackrefMapping>(
+  return with_btree<BackrefBtree>(
     cache,
     c,
     [c, offset](auto &btree) {
@@ -503,7 +503,7 @@ BtreeBackrefManager::remove_mapping(
   paddr_t addr)
 {
   auto c = get_context(t);
-  return with_btree_ret<BackrefBtree, remove_mapping_result_t>(
+  return with_btree<BackrefBtree>(
     cache,
     c,
     [c, addr](auto &btree) mutable {
@@ -574,7 +574,7 @@ BtreeBackrefManager::retrieve_backref_extents_in_range(
        ent.key);
 
       auto c = get_context(t);
-      return with_btree_ret<BackrefBtree, CachedExtentRef>(
+      return with_btree<BackrefBtree>(
        cache,
        c,
        [c, &ent](auto &btree) {

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index 103e24ad151551bcb4ff08986f9fddd0602404fa..61c0769a06da17b4fd82d38e3232f300d7daf449 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -2204,25 +2204,4 @@ auto with_btree_state(
     cache, c, State{}, std::forward<F>(f));
 }
 
-template <
-  typename tree_type_t,
-  typename Ret,
-  typename F>
-auto with_btree_ret(
-  Cache &cache,
-  op_context_t c,
-  F &&f) {
-  return with_btree_state<tree_type_t, Ret>(
-    cache,
-    c,
-    [f=std::forward<F>(f)](auto &btree, auto &ret) mutable {
-      return f(
-        btree
-      ).si_then([&ret](auto &&_ret) {
-        ret = std::move(_ret);
-      });
-    });
 }
-
-}
-

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc
index 3c613dbbd27d449a5e7d7c65669ba2fed908852d..f9e2b2f962a6d0d4cb5c4c0abba16ba373f73175 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -707,7 +707,7 @@ BtreeLBAManager::get_physical_extent_if_live(
          t, type, laddr, addr, len);
   ceph_assert(is_lba_node(type));
   auto c = get_context(t);
-  return with_btree_ret<LBABtree, CachedExtentRef>(
+  return with_btree<LBABtree>(
     cache,
     c,
     [c, type, addr, laddr, len](auto &btree) {