From 6f744a5549c698b6a2cb6b6df31173f7e21b0931 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 5 Nov 2020 20:17:09 -0800 Subject: [PATCH] crimson/os/seastore/.../lba_btree_node_impl: fix merge_entry return values Signed-off-by: Samuel Just --- .../os/seastore/lba_manager/btree/lba_btree_node_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc index 2559da4df5d..7587cb9188e 100644 --- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc +++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc @@ -360,7 +360,7 @@ LBAInternalNode::merge_entry( c.cache.retire_extent(c.trans, l); c.cache.retire_extent(c.trans, r); - return split_ertr::make_ready_future(replacement); + return merge_ertr::make_ready_future(replacement); } else { logger().debug( "LBAInternalEntry::merge_entry balanced l {} r {}", @@ -384,7 +384,7 @@ LBAInternalNode::merge_entry( c.cache.retire_extent(c.trans, l); c.cache.retire_extent(c.trans, r); - return split_ertr::make_ready_future( + return merge_ertr::make_ready_future( addr >= pivot ? replacement_r : replacement_l ); } -- 2.39.5