Skip to content

Commit 6856dba

Browse files
committed
crimson/os/seastore/btree: fix fixed_kv_btree's type errors
Signed-off-by: Xuehan Xu <[email protected]>
1 parent f292b67 commit 6856dba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/crimson/os/seastore/btree/fixed_kv_btree.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ class FixedKVBtree {
12981298
paddr_t offset,
12991299
node_key_t begin,
13001300
node_key_t end,
1301-
typename std::optional<node_position_t<leaf_node_t>> parent_pos)
1301+
typename std::optional<node_position_t<internal_node_t>> parent_pos)
13021302
{
13031303
LOG_PREFIX(FixedKVBtree::get_leaf_node);
13041304
SUBTRACET(
@@ -1596,8 +1596,8 @@ class FixedKVBtree {
15961596
node_iter->get_val().maybe_relative_to(parent->get_paddr()),
15971597
begin,
15981598
end,
1599-
std::make_optional<node_position_t<leaf_node_t>>(
1600-
child_pos.template get_parent<leaf_node_t>(),
1599+
std::make_optional<node_position_t<internal_node_t>>(
1600+
child_pos.template get_parent<internal_node_t>(),
16011601
child_pos.get_pos())
16021602
).si_then([on_found=std::move(on_found)](LeafNodeRef node) {
16031603
return on_found(node);
@@ -2002,7 +2002,7 @@ class FixedKVBtree {
20022002
paddr_t addr,
20032003
node_key_t begin,
20042004
node_key_t end,
2005-
typename std::optional<node_position_t<leaf_node_t>> parent_pos) {
2005+
typename std::optional<node_position_t<internal_node_t>> parent_pos) {
20062006
assert(depth == 1);
20072007
return get_leaf_node(c, addr, begin, end, std::move(parent_pos));
20082008
}
@@ -2149,8 +2149,8 @@ class FixedKVBtree {
21492149
donor_iter.get_val().maybe_relative_to(parent_pos.node->get_paddr()),
21502150
begin,
21512151
end,
2152-
std::make_optional<node_position_t<NodeType>>(
2153-
child_pos.template get_parent<NodeType>(),
2152+
std::make_optional<node_position_t<internal_node_t>>(
2153+
child_pos.template get_parent<internal_node_t>(),
21542154
child_pos.get_pos())
21552155
).si_then([do_merge=std::move(do_merge)](typename NodeType::Ref donor) {
21562156
return do_merge(donor);

0 commit comments

Comments
 (0)