From: Samuel Just <sjust@redhat.com>
Date: Mon, 19 Oct 2020 20:14:21 +0000 (-0700)
Subject: crimson/os/seastore/.../lba_btree_node_impl: always return absolute or record relativ... 
X-Git-Tag: v16.1.0~807^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0266f5851ee1bd936b56d44d624b7bdded1a1ab3;p=ceph.git

crimson/os/seastore/.../lba_btree_node_impl: always return absolute or record relative addrs

insert and lookup_range should return absolute or record-relative addrs,
never block relative.

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 1260d477abf5..39dcf9f9efef 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
@@ -436,7 +436,7 @@ LBALeafNode::lookup_range_ret LBALeafNode::lookup_range(
     ret.emplace_back(
       std::make_unique<BtreeLBAPin>(
 	this,
-	val.paddr,
+	val.paddr.maybe_relative_to(get_paddr()),
 	lba_node_meta_t{ begin, begin + val.len, 0}));
   }
   return lookup_range_ertr::make_ready_future<lba_pin_list_t>(
@@ -475,7 +475,7 @@ LBALeafNode::insert_ret LBALeafNode::insert(
     insert_ertr::ready_future_marker{},
     std::make_unique<BtreeLBAPin>(
       this,
-      val.paddr,
+      val.paddr.maybe_relative_to(get_paddr()),
       lba_node_meta_t{ begin, begin + val.len, 0}));
 }