update ceph source to reef 18.2.1

[ceph.git] / ceph / src / crimson / os / seastore / lba_manager / btree / lba_btree_node.cc

diff --git a/ceph/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc b/ceph/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
index a33f75917c1f986fa7d54a630392ff0d86fd21d1..66dc94394a99e16ccdacff22ebe3808d53cff470 100644 (file)
--- a/ceph/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
+++ b/ceph/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
@@ -20,7 +20,7 @@ namespace crimson::os::seastore::lba_manager::btree {
 std::ostream& operator<<(std::ostream& out, const lba_map_val_t& v)
 {
   return out << "lba_map_val_t("
-             << v.paddr
+             << v.pladdr
              << "~" << v.len
              << ", refcount=" << v.refcount
              << ", checksum=" << v.checksum
@@ -42,10 +42,11 @@ void LBALeafNode::resolve_relative_addrs(paddr_t base)
 {
   LOG_PREFIX(LBALeafNode::resolve_relative_addrs);
   for (auto i: *this) {
-    if (i->get_val().paddr.is_relative()) {
-      auto val = i->get_val();
-      val.paddr = base.add_relative(val.paddr);
-      TRACE("{} -> {}", i->get_val().paddr, val.paddr);
+    auto val = i->get_val();
+    if (val.pladdr.is_paddr() &&
+       val.pladdr.get_paddr().is_relative()) {
+      val.pladdr = base.add_relative(val.pladdr.get_paddr());
+      TRACE("{} -> {}", i->get_val().pladdr, val.pladdr);
       i->set_val(val);
     }
   }