crimson/os/seastore/btree: remove the unused template argument of op_context_t

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

diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc
index d45e505a298e083b1dcd746a8720e5bedb59e034..92f9f30bb6350eaae524ea6c191f5eb00d65f9d4 100644 (file)
--- a/src/crimson/os/seastore/backref/btree_backref_manager.cc
+++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc
@@ -22,7 +22,7 @@ phy_tree_root_t& get_phy_tree_root<
 template<>
 const get_phy_tree_root_node_ret get_phy_tree_root_node<
   crimson::os::seastore::backref::BackrefBtree>(
-  const RootBlockRef &root_block, op_context_t<paddr_t> c) {
+  const RootBlockRef &root_block, op_context_t c) {
   auto backref_root = root_block->backref_root_node;
   if (backref_root) {
     ceph_assert(backref_root->is_initial_pending()
@@ -455,7 +455,7 @@ BtreeBackrefManager::scan_mapped_space(
 }
 
 BtreeBackrefManager::base_iertr::future<> _init_cached_extent(
-  op_context_t<paddr_t> c,
+  op_context_t c,
   const CachedExtentRef &e,
   BackrefBtree &btree,
   bool &ret)

diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.h b/src/crimson/os/seastore/backref/btree_backref_manager.h
index 8d1839fc12f7bcaf4806b53dde8759362effe7c4..1f8107834fc97e59234259d00b3a8999a6d1a01f 100644 (file)
--- a/src/crimson/os/seastore/backref/btree_backref_manager.h
+++ b/src/crimson/os/seastore/backref/btree_backref_manager.h
@@ -11,10 +11,10 @@ namespace crimson::os::seastore::backref {
 
 class BtreeBackrefMapping : public BackrefMapping {
 public:
-  BtreeBackrefMapping(op_context_t<paddr_t> ctx)
+  BtreeBackrefMapping(op_context_t ctx)
     : BackrefMapping(ctx) {}
   BtreeBackrefMapping(
-    op_context_t<paddr_t> ctx,
+    op_context_t ctx,
     BackrefLeafNodeRef parent,
     uint16_t pos,
     backref_map_val_t &val,
@@ -101,8 +101,8 @@ public:
 private:
   Cache &cache;
 
-  op_context_t<paddr_t> get_context(Transaction &t) {
-    return op_context_t<paddr_t>{cache, t};
+  op_context_t get_context(Transaction &t) {
+    return op_context_t{cache, t};
   }
 };
 

diff --git a/src/crimson/os/seastore/backref_mapping.h b/src/crimson/os/seastore/backref_mapping.h
index d0a6a0ea6fff66cbdf46df328f5441e4325b073a..053ae201852950dcbf8fa689e5c008620f7d7003 100644 (file)
--- a/src/crimson/os/seastore/backref_mapping.h
+++ b/src/crimson/os/seastore/backref_mapping.h
@@ -10,7 +10,7 @@ namespace crimson::os::seastore {
 class BackrefMapping : public BtreeNodeMapping<paddr_t, laddr_t> {
   extent_types_t type;
 public:
-  BackrefMapping(op_context_t<paddr_t> ctx)
+  BackrefMapping(op_context_t ctx)
     : BtreeNodeMapping(ctx) {}
   template <typename... T>
   BackrefMapping(extent_types_t type, T&&... t)

diff --git a/src/crimson/os/seastore/btree/btree_range_pin.h b/src/crimson/os/seastore/btree/btree_range_pin.h
index 148353276d1ed9e8ac8f96599a4db0615726f830..1106aeccab620b3f0c78925f8aaa48579817ba27 100644 (file)
--- a/src/crimson/os/seastore/btree/btree_range_pin.h
+++ b/src/crimson/os/seastore/btree/btree_range_pin.h
@@ -14,7 +14,6 @@
 namespace crimson::os::seastore {
 class Cache;
 
-template <typename node_key_t>
 struct op_context_t {
   Cache &cache;
   Transaction &trans;
@@ -104,7 +103,7 @@ struct __attribute__((packed)) fixed_kv_node_meta_le_t {
 template <typename key_t, typename val_t>
 class BtreeNodeMapping : public PhysicalNodeMapping<key_t, val_t> {
 protected:
-  op_context_t<key_t> ctx;
+  op_context_t ctx;
   /**
    * parent
    *
@@ -123,10 +122,10 @@ protected:
 
 public:
   using val_type = val_t;
-  BtreeNodeMapping(op_context_t<key_t> ctx) : ctx(ctx) {}
+  BtreeNodeMapping(op_context_t ctx) : ctx(ctx) {}
 
   BtreeNodeMapping(
-    op_context_t<key_t> ctx,
+    op_context_t ctx,
     CachedExtentRef parent,
     uint16_t pos,
     pladdr_t value,

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index 9db2d89ce6e4baf05e02dc8e47799d7c75317c94..2cf89346bbb75cbb695f5753f8820d0fbf9a9218 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -28,10 +28,10 @@ phy_tree_root_t& get_phy_tree_root(root_t& r);
 using get_phy_tree_root_node_ret =
   std::pair<bool, get_child_iertr::future<CachedExtentRef>>;
 
-template <typename T, typename key_t>
+template <typename T>
 const get_phy_tree_root_node_ret get_phy_tree_root_node(
   const RootBlockRef &root_block,
-  op_context_t<key_t> c);
+  op_context_t c);
 
 template <typename T>
 Transaction::tree_stats_t& get_tree_stats(Transaction &t);
@@ -79,7 +79,7 @@ public:
     iterator &operator=(iterator &&) = default;
 
     iterator_fut next(
-      op_context_t<node_key_t> c,
+      op_context_t c,
       mapped_space_visitor_t *visitor=nullptr) const
     {
       assert_valid();
@@ -105,7 +105,7 @@ public:
 
     }
 
-    iterator_fut prev(op_context_t<node_key_t> c) const
+    iterator_fut prev(op_context_t c) const
     {
       assert_valid();
       assert(!is_begin());
@@ -205,7 +205,7 @@ public:
       return leaf.pos == 0;
     }
 
-    std::unique_ptr<pin_t> get_pin(op_context_t<node_key_t> ctx) const {
+    std::unique_ptr<pin_t> get_pin(op_context_t ctx) const {
       assert(!is_end());
       auto val = get_val();
       auto key = get_key();
@@ -269,7 +269,7 @@ public:
     using handle_boundary_ertr = base_iertr;
     using handle_boundary_ret = handle_boundary_ertr::future<>;
     handle_boundary_ret handle_boundary(
-      op_context_t<node_key_t> c,
+      op_context_t c,
       mapped_space_visitor_t *visitor)
     {
       assert(at_boundary());
@@ -330,13 +330,13 @@ public:
     TreeRootLinker<RootBlock, T>::link_root(root_block, root_node.get());
   }
 
-  auto get_root_node(op_context_t<node_key_t> c) const {
+  auto get_root_node(op_context_t c) const {
     return get_phy_tree_root_node<self_type>(root_block, c);
   }
 
   /// mkfs
   using mkfs_ret = phy_tree_root_t;
-  static mkfs_ret mkfs(RootBlockRef &root_block, op_context_t<node_key_t> c) {
+  static mkfs_ret mkfs(RootBlockRef &root_block, op_context_t c) {
     assert(root_block->is_mutation_pending());
     auto root_leaf = c.cache.template alloc_new_non_data_extent<leaf_node_t>(
       c.trans,
@@ -361,7 +361,7 @@ public:
    * @return least iterator >= key
    */
   iterator_fut lower_bound(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     node_key_t addr,
     mapped_space_visitor_t *visitor=nullptr,
     depth_t min_depth = 1) const
@@ -412,7 +412,7 @@ public:
    * @return least iterator > key
    */
   iterator_fut upper_bound(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     node_key_t addr
   ) const {
     return lower_bound(
@@ -436,7 +436,7 @@ public:
    * @return least iterator i s.t. i.get_key() + i.get_val().len > key
    */
   iterator_fut upper_bound_right(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     node_key_t addr) const
   {
     return lower_bound(
@@ -464,10 +464,10 @@ public:
     });
   }
 
-  iterator_fut begin(op_context_t<node_key_t> c) const {
+  iterator_fut begin(op_context_t c) const {
     return lower_bound(c, min_max_t<node_key_t>::min);
   }
-  iterator_fut end(op_context_t<node_key_t> c) const {
+  iterator_fut end(op_context_t c) const {
     return upper_bound(c, min_max_t<node_key_t>::max);
   }
 
@@ -475,7 +475,7 @@ public:
   template <typename child_node_t, typename node_t, bool lhc = leaf_has_children,
            typename std::enable_if<lhc, int>::type = 0>
   void check_node(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     TCachedExtentRef<node_t> node)
   {
     for (auto i : *node) {
@@ -593,7 +593,7 @@ public:
   template <bool lhc = leaf_has_children,
             typename std::enable_if<lhc, int>::type = 0>
   check_child_trackers_ret check_child_trackers(
-    op_context_t<node_key_t> c) {
+    op_context_t c) {
     mapped_space_visitor_t checker = [c, this](
       paddr_t,
       node_key_t,
@@ -649,7 +649,7 @@ public:
     seastar::stop_iteration>;
   template <typename F>
   static base_iertr::future<> iterate_repeat(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator_fut &&iter_fut,
     F &&f,
     mapped_space_visitor_t *visitor=nullptr) {
@@ -704,7 +704,7 @@ public:
   using insert_iertr = base_iertr;
   using insert_ret = insert_iertr::future<std::pair<iterator, bool>>;
   insert_ret insert(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator iter,
     node_key_t laddr,
     node_val_t val
@@ -754,7 +754,7 @@ public:
   }
 
   insert_ret insert(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     node_key_t laddr,
     node_val_t val) {
     return lower_bound(
@@ -777,7 +777,7 @@ public:
   using update_iertr = base_iertr;
   using update_ret = update_iertr::future<iterator>;
   update_ret update(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator iter,
     node_val_t val)
   {
@@ -814,7 +814,7 @@ public:
   using remove_iertr = base_iertr;
   using remove_ret = remove_iertr::future<>;
   remove_ret remove(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator iter)
   {
     LOG_PREFIX(FixedKVBtree::remove);
@@ -854,7 +854,7 @@ public:
   using init_cached_extent_iertr = base_iertr;
   using init_cached_extent_ret = init_cached_extent_iertr::future<bool>;
   init_cached_extent_ret init_cached_extent(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     CachedExtentRef e)
   {
     assert(!e->is_logical());
@@ -925,7 +925,7 @@ public:
   using get_leaf_if_live_iertr = base_iertr;
   using get_leaf_if_live_ret = get_leaf_if_live_iertr::future<CachedExtentRef>;
   get_leaf_if_live_ret get_leaf_if_live(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     paddr_t addr,
     node_key_t laddr,
     extent_len_t len)
@@ -963,7 +963,7 @@ public:
   using get_internal_if_live_iertr = base_iertr;
   using get_internal_if_live_ret = get_internal_if_live_iertr::future<CachedExtentRef>;
   get_internal_if_live_ret get_internal_if_live(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     paddr_t addr,
     node_key_t laddr,
     extent_len_t len)
@@ -1009,7 +1009,7 @@ public:
   using rewrite_extent_iertr = base_iertr;
   using rewrite_extent_ret = rewrite_extent_iertr::future<>;
   rewrite_extent_ret rewrite_extent(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     CachedExtentRef e) {
     LOG_PREFIX(FixedKVBtree::rewrite_extent);
     assert(is_lba_backref_node(e->get_type()));
@@ -1059,7 +1059,7 @@ public:
   template <typename T>
   requires std::is_same_v<internal_node_t, T> || std::is_same_v<leaf_node_t, T>
   update_internal_mapping_ret update_internal_mapping(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     depth_t depth,
     node_key_t laddr,
     paddr_t old_addr,
@@ -1182,7 +1182,7 @@ private:
   using get_internal_node_iertr = base_iertr;
   using get_internal_node_ret = get_internal_node_iertr::future<InternalNodeRef>;
   static get_internal_node_ret get_internal_node(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     depth_t depth,
     paddr_t offset,
     node_key_t begin,
@@ -1271,7 +1271,7 @@ private:
   using get_leaf_node_iertr = base_iertr;
   using get_leaf_node_ret = get_leaf_node_iertr::future<LeafNodeRef>;
   static get_leaf_node_ret get_leaf_node(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     paddr_t offset,
     node_key_t begin,
     node_key_t end,
@@ -1355,7 +1355,7 @@ private:
   using lookup_root_iertr = base_iertr;
   using lookup_root_ret = lookup_root_iertr::future<>;
   lookup_root_ret lookup_root(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator &iter,
     mapped_space_visitor_t *visitor) const {
     LOG_PREFIX(FixedKVBtree::lookup_root);
@@ -1443,7 +1443,7 @@ private:
   using lookup_internal_level_ret = lookup_internal_level_iertr::future<>;
   template <typename F>
   static lookup_internal_level_ret lookup_internal_level(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     depth_t depth,
     iterator &iter,
     F &f,
@@ -1517,7 +1517,7 @@ private:
   using lookup_leaf_ret = lookup_leaf_iertr::future<>;
   template <typename F>
   static lookup_internal_level_ret lookup_leaf(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator &iter,
     F &f,
     mapped_space_visitor_t *visitor
@@ -1596,7 +1596,7 @@ private:
   using lookup_depth_range_ret = lookup_depth_range_iertr::future<>;
   template <typename LI, typename LL>
   static lookup_depth_range_ret lookup_depth_range(
-    op_context_t<node_key_t> c, ///< [in] context
+    op_context_t c, ///< [in] context
     iterator &iter, ///< [in,out] iterator to populate
     depth_t from,   ///< [in] from inclusive
     depth_t to,     ///< [in] to exclusive, (to <= from, to == from is a noop)
@@ -1647,7 +1647,7 @@ private:
   using lookup_ret = lookup_iertr::future<iterator>;
   template <typename LI, typename LL>
   lookup_ret lookup(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     LI &&lookup_internal,
     LL &&lookup_leaf,
     depth_t min_depth,
@@ -1711,7 +1711,7 @@ private:
   using find_insertion_iertr = base_iertr;
   using find_insertion_ret = find_insertion_iertr::future<>;
   static find_insertion_ret find_insertion(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     node_key_t laddr,
     iterator &iter)
   {
@@ -1759,7 +1759,7 @@ private:
   using handle_split_iertr = base_iertr;
   using handle_split_ret = handle_split_iertr::future<>;
   handle_split_ret handle_split(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator &iter)
   {
     LOG_PREFIX(FixedKVBtree::handle_split);
@@ -1888,7 +1888,7 @@ private:
   using handle_merge_iertr = base_iertr;
   using handle_merge_ret = handle_merge_iertr::future<>;
   handle_merge_ret handle_merge(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     iterator &iter)
   {
     LOG_PREFIX(FixedKVBtree::handle_merge);
@@ -1977,7 +1977,7 @@ private:
   template <typename NodeType,
             std::enable_if_t<std::is_same_v<NodeType, leaf_node_t>, int> = 0>
   base_iertr::future<typename NodeType::Ref> get_node(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     depth_t depth,
     paddr_t addr,
     node_key_t begin,
@@ -1990,7 +1990,7 @@ private:
   template <typename NodeType,
             std::enable_if_t<std::is_same_v<NodeType, internal_node_t>, int> = 0>
   base_iertr::future<typename NodeType::Ref> get_node(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     depth_t depth,
     paddr_t addr,
     node_key_t begin,
@@ -2001,7 +2001,7 @@ private:
 
   template <typename NodeType>
   handle_merge_ret merge_level(
-    op_context_t<node_key_t> c,
+    op_context_t c,
     depth_t depth,
     node_position_t<internal_node_t> &parent_pos,
     node_position_t<NodeType> &pos)
@@ -2161,12 +2161,11 @@ struct is_fixed_kv_tree<
 
 template <
   typename tree_type_t,
-  typename node_key_t,
   typename F,
   std::enable_if_t<is_fixed_kv_tree<tree_type_t>::value, int> = 0>
 auto with_btree(
   Cache &cache,
-  op_context_t<node_key_t> c,
+  op_context_t c,
   F &&f) {
   return cache.get_root(
     c.trans
@@ -2182,12 +2181,11 @@ auto with_btree(
 template <
   typename tree_type_t,
   typename State,
-  typename node_key_t,
   typename F,
   std::enable_if_t<is_fixed_kv_tree<tree_type_t>::value, int> = 0>
 auto with_btree_state(
   Cache &cache,
-  op_context_t<node_key_t> c,
+  op_context_t c,
   State &&init,
   F &&f) {
   return seastar::do_with(
@@ -2207,12 +2205,11 @@ auto with_btree_state(
 template <
   typename tree_type_t,
   typename State,
-  typename node_key_t,
   typename F,
   std::enable_if_t<is_fixed_kv_tree<tree_type_t>::value, int> = 0>
 auto with_btree_state(
   Cache &cache,
-  op_context_t<node_key_t> c,
+  op_context_t c,
   F &&f) {
   return crimson::os::seastore::with_btree_state<tree_type_t, State>(
     cache, c, State{}, std::forward<F>(f));
@@ -2221,11 +2218,10 @@ auto with_btree_state(
 template <
   typename tree_type_t,
   typename Ret,
-  typename node_key_t,
   typename F>
 auto with_btree_ret(
   Cache &cache,
-  op_context_t<node_key_t> c,
+  op_context_t c,
   F &&f) {
   return with_btree_state<tree_type_t, Ret>(
     cache,

diff --git a/src/crimson/os/seastore/btree/fixed_kv_node.h b/src/crimson/os/seastore/btree/fixed_kv_node.h
index 8ee42895276d2e3781533442e0058e9cb7fb076c..fc1bdbb5da603351358d91ca1154bbc3d4a349f6 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_node.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_node.h
@@ -307,7 +307,7 @@ struct FixedKVInternalNode
   }
 
   std::tuple<Ref, Ref, NODE_KEY>
-  make_split_children(op_context_t<NODE_KEY> c) {
+  make_split_children(op_context_t c) {
     auto left = c.cache.template alloc_new_non_data_extent<node_type_t>(
       c.trans, node_size, placement_hint_t::HOT, INIT_GENERATION);
     auto right = c.cache.template alloc_new_non_data_extent<node_type_t>(
@@ -324,7 +324,7 @@ struct FixedKVInternalNode
   }
 
   Ref make_full_merge(
-    op_context_t<NODE_KEY> c,
+    op_context_t c,
     Ref &right) {
     auto replacement = c.cache.template alloc_new_non_data_extent<node_type_t>(
       c.trans, node_size, placement_hint_t::HOT, INIT_GENERATION);
@@ -339,7 +339,7 @@ struct FixedKVInternalNode
 
   std::tuple<Ref, Ref, NODE_KEY>
   make_balanced(
-    op_context_t<NODE_KEY> c,
+    op_context_t c,
     Ref &_right,
     uint32_t pivot_idx) {
     ceph_assert(_right->get_type() == this->get_type());
@@ -646,7 +646,7 @@ struct FixedKVLeafNode
     node_type_t &right) = 0;
 
   std::tuple<Ref, Ref, NODE_KEY>
-  make_split_children(op_context_t<NODE_KEY> c) {
+  make_split_children(op_context_t c) {
     auto left = c.cache.template alloc_new_non_data_extent<node_type_t>(
       c.trans, node_size, placement_hint_t::HOT, INIT_GENERATION);
     auto right = c.cache.template alloc_new_non_data_extent<node_type_t>(
@@ -672,7 +672,7 @@ struct FixedKVLeafNode
     node_type_t &right) = 0;
 
   Ref make_full_merge(
-    op_context_t<NODE_KEY> c,
+    op_context_t c,
     Ref &right) {
     auto replacement = c.cache.template alloc_new_non_data_extent<node_type_t>(
       c.trans, node_size, placement_hint_t::HOT, INIT_GENERATION);
@@ -701,7 +701,7 @@ struct FixedKVLeafNode
 
   std::tuple<Ref, Ref, NODE_KEY>
   make_balanced(
-    op_context_t<NODE_KEY> c,
+    op_context_t c,
     Ref &_right,
     uint32_t pivot_idx) {
     ceph_assert(_right->get_type() == this->get_type());

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
index 967cc682e4b4c92093829bce197af0f5560556a0..f4c36b30312d8dd84fee69533536940ec074d31b 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
@@ -45,7 +45,7 @@ get_phy_tree_root<
 template <>
 const get_phy_tree_root_node_ret get_phy_tree_root_node<
   crimson::os::seastore::lba_manager::btree::LBABtree>(
-  const RootBlockRef &root_block, op_context_t<laddr_t> c)
+  const RootBlockRef &root_block, op_context_t c)
 {
   auto lba_root = root_block->lba_root_node;
   if (lba_root) {
@@ -193,7 +193,7 @@ BtreeLBAManager::get_mappings(
 
 BtreeLBAManager::_get_mappings_ret
 BtreeLBAManager::_get_mappings(
-  op_context_t<laddr_t> c,
+  op_context_t c,
   LBABtree& btree,
   laddr_t laddr,
   extent_len_t length)
@@ -231,7 +231,7 @@ BtreeLBAManager::_get_mappings(
 
 BtreeLBAManager::get_indirect_pin_ret
 BtreeLBAManager::get_indirect_pin(
-  op_context_t<laddr_t> c,
+  op_context_t c,
   LBABtree& btree,
   laddr_t key,
   laddr_t intermediate_key,
@@ -289,7 +289,7 @@ BtreeLBAManager::get_mapping(
 
 BtreeLBAManager::_get_mapping_ret
 BtreeLBAManager::_get_mapping(
-  op_context_t<laddr_t> c,
+  op_context_t c,
   LBABtree& btree,
   laddr_t laddr)
 {
@@ -469,7 +469,7 @@ static bool is_lba_node(const CachedExtent &e)
 
 BtreeLBAManager::base_iertr::template future<>
 _init_cached_extent(
-  op_context_t<laddr_t> c,
+  op_context_t c,
   const CachedExtentRef &e,
   LBABtree &btree,
   bool &ret)

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
index 97ab4aeca353fbcd5d19e84115ea71527a2f7c2d..3dac0e5afe32748b7dfb8d20c753ff2c7110ec62 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
@@ -62,10 +62,10 @@ class BtreeLBAMapping : public LBAMapping {
 // NOTE THAT, for direct BtreeLBAMappings, their intermediate_keys are the same as
 // their keys.
 public:
-  BtreeLBAMapping(op_context_t<laddr_t> ctx)
+  BtreeLBAMapping(op_context_t ctx)
     : LBAMapping(ctx) {}
   BtreeLBAMapping(
-    op_context_t<laddr_t> c,
+    op_context_t c,
     LBALeafNodeRef parent,
     uint16_t pos,
     lba_map_val_t &val,
@@ -203,7 +203,7 @@ public:
 
 protected:
   LBAMappingRef _duplicate(
-    op_context_t<laddr_t> ctx) const final {
+    op_context_t ctx) const final {
     auto pin = std::unique_ptr<BtreeLBAMapping>(new BtreeLBAMapping(ctx));
     pin->key = key;
     pin->intermediate_base = intermediate_base;
@@ -600,8 +600,8 @@ private:
     uint64_t num_alloc_extents_iter_nexts = 0;
   } stats;
 
-  op_context_t<laddr_t> get_context(Transaction &t) {
-    return op_context_t<laddr_t>{cache, t};
+  op_context_t get_context(Transaction &t) {
+    return op_context_t{cache, t};
   }
 
   seastar::metrics::metric_group metrics;
@@ -702,20 +702,20 @@ private:
 
   using _get_mapping_ret = get_mapping_iertr::future<BtreeLBAMappingRef>;
   _get_mapping_ret _get_mapping(
-    op_context_t<laddr_t> c,
+    op_context_t c,
     LBABtree& btree,
     laddr_t offset);
 
   using _get_mappings_ret = get_mappings_iertr::future<std::list<BtreeLBAMappingRef>>;
   _get_mappings_ret _get_mappings(
-    op_context_t<laddr_t> c,
+    op_context_t c,
     LBABtree& btree,
     laddr_t offset,
     extent_len_t length);
 
   using get_indirect_pin_ret = get_mappings_iertr::future<BtreeLBAMappingRef>;
   get_indirect_pin_ret get_indirect_pin(
-    op_context_t<laddr_t> c,
+    op_context_t c,
     LBABtree& btree,
     laddr_t key,
     laddr_t intermediate_key,

diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
index 5443942003233565f7a2b87ceaf845ddedb4a9b6..14ac8af4003554753de8a08c95fb34dba02f8683 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
@@ -74,7 +74,7 @@ void LBALeafNode::maybe_fix_mapping_pos(BtreeLBAMapping &mapping)
 }
 
 BtreeLBAMappingRef LBALeafNode::get_mapping(
-  op_context_t<laddr_t> c, laddr_t laddr)
+  op_context_t c, laddr_t laddr)
 {
   auto iter = lower_bound(laddr);
   ceph_assert(iter != end() && iter->get_key() == laddr);

diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
index ef363d44e6cd4b206f938a39639d36242c6a258a..daef8e6a4fa51ad15a80f576c23f0846612208fb 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
+++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
@@ -262,13 +262,13 @@ struct LBALeafNode
   }
 
   bool is_child_stable(
-    op_context_t<laddr_t> c,
+    op_context_t c,
     uint16_t pos,
     laddr_t key) const {
     return parent_node_t::_is_child_stable(c.trans, c.cache, pos, key);
   }
   bool is_child_data_stable(
-    op_context_t<laddr_t> c,
+    op_context_t c,
     uint16_t pos,
     laddr_t key) const {
     return parent_node_t::_is_child_stable(c.trans, c.cache, pos, key, true);
@@ -328,7 +328,7 @@ struct LBALeafNode
   std::ostream &print_detail(std::ostream &out) const final;
 
   void maybe_fix_mapping_pos(BtreeLBAMapping &mapping);
-  std::unique_ptr<BtreeLBAMapping> get_mapping(op_context_t<laddr_t> c, laddr_t laddr);
+  std::unique_ptr<BtreeLBAMapping> get_mapping(op_context_t c, laddr_t laddr);
 };
 using LBALeafNodeRef = TCachedExtentRef<LBALeafNode>;
 

diff --git a/src/crimson/os/seastore/lba_mapping.h b/src/crimson/os/seastore/lba_mapping.h
index 3455c6779b5d4a03437b988820ed9c63f076fa40..73a44f35de34c82ff1f514376bd47793188e72ca 100644 (file)
--- a/src/crimson/os/seastore/lba_mapping.h
+++ b/src/crimson/os/seastore/lba_mapping.h
@@ -17,7 +17,7 @@ class LogicalCachedExtent;
 
 class LBAMapping : public BtreeNodeMapping<laddr_t, paddr_t> {
 public:
-  LBAMapping(op_context_t<laddr_t> ctx)
+  LBAMapping(op_context_t ctx)
     : BtreeNodeMapping<laddr_t, paddr_t>(ctx) {}
   template <typename... T>
   LBAMapping(T&&... t)
@@ -54,7 +54,7 @@ public:
 
   virtual ~LBAMapping() {}
 protected:
-  virtual LBAMappingRef _duplicate(op_context_t<laddr_t>) const = 0;
+  virtual LBAMappingRef _duplicate(op_context_t) const = 0;
   std::optional<child_pos_t<
     lba_manager::btree::LBALeafNode>> child_pos = std::nullopt;
 };

diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc
index 68293262e4e8c238a4a1f75f53538955ddd32495..3c40fb2e01359fd2e7a01a816dc6c896466fc81d 100644 (file)
--- a/src/test/crimson/seastore/test_btree_lba_manager.cc
+++ b/src/test/crimson/seastore/test_btree_lba_manager.cc
@@ -221,7 +221,7 @@ struct lba_btree_test : btree_test_base {
   std::map<laddr_t, lba_map_val_t> check;
 
   auto get_op_context(Transaction &t) {
-    return op_context_t<laddr_t>{*cache, t};
+    return op_context_t{*cache, t};
   }
 
   LBAManager::mkfs_ret test_structure_setup(Transaction &t) final {