From: Xuehan Xu <xuxuehan@qianxin.com>
Date: Fri, 17 Jan 2025 10:45:27 +0000 (+0800)
Subject: crimson/os/seastore/btree: fix fixed_kv_btree's type errors
X-Git-Tag: v20.0.0~123^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6856dba3ed0b59a505734c8d89b5c6e32fadcec8;p=ceph.git

crimson/os/seastore/btree: fix fixed_kv_btree's type errors

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
---

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index 04ebcc7e2ca..88f7cea9ed8 100644
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -1298,7 +1298,7 @@ private:
     paddr_t offset,
     node_key_t begin,
     node_key_t end,
-    typename std::optional<node_position_t<leaf_node_t>> parent_pos)
+    typename std::optional<node_position_t<internal_node_t>> parent_pos)
   {
     LOG_PREFIX(FixedKVBtree::get_leaf_node);
     SUBTRACET(
@@ -1596,8 +1596,8 @@ private:
       node_iter->get_val().maybe_relative_to(parent->get_paddr()),
       begin,
       end,
-      std::make_optional<node_position_t<leaf_node_t>>(
-        child_pos.template get_parent<leaf_node_t>(),
+      std::make_optional<node_position_t<internal_node_t>>(
+        child_pos.template get_parent<internal_node_t>(),
         child_pos.get_pos())
     ).si_then([on_found=std::move(on_found)](LeafNodeRef node) {
       return on_found(node);
@@ -2002,7 +2002,7 @@ private:
     paddr_t addr,
     node_key_t begin,
     node_key_t end,
-    typename std::optional<node_position_t<leaf_node_t>> parent_pos) {
+    typename std::optional<node_position_t<internal_node_t>> parent_pos) {
     assert(depth == 1);
     return get_leaf_node(c, addr, begin, end, std::move(parent_pos));
   }
@@ -2149,8 +2149,8 @@ private:
       donor_iter.get_val().maybe_relative_to(parent_pos.node->get_paddr()),
       begin,
       end,
-      std::make_optional<node_position_t<NodeType>>(
-        child_pos.template get_parent<NodeType>(),
+      std::make_optional<node_position_t<internal_node_t>>(
+        child_pos.template get_parent<internal_node_t>(),
         child_pos.get_pos())
     ).si_then([do_merge=std::move(do_merge)](typename NodeType::Ref donor) {
       return do_merge(donor);