crimson/os/seastore/.../lba_btree_node_impl: fix merge_entry return values

Signed-off-by: Samuel Just <sjust@redhat.com>

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 2559da4df5d17a80a9d6e024ae892835b569b1f5..7587cb9188e4507a11eeb3d50fdf958645b2c068 100644 (file)
--- 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<LBANodeRef>(replacement);
+      return merge_ertr::make_ready_future<LBANodeRef>(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<LBANodeRef>(
+      return merge_ertr::make_ready_future<LBANodeRef>(
        addr >= pivot ? replacement_r : replacement_l
       );
     }