From d313b3a65a7607732b80be412bdddfcdfb30e6d5 Mon Sep 17 00:00:00 2001
From: Zhang Song <zhangsong02@qianxin.com>
Date: Fri, 9 May 2025 16:12:16 +0800
Subject: [PATCH] crimson/os/seastore/lba: flatten lba namespace to keep
 consistent with backref

Signed-off-by: Zhang Song <zhangsong02@qianxin.com>
(cherry picked from commit 4593e5177d20ce22943123ae986c3c86e8d010a1)
---
 src/crimson/os/seastore/CMakeLists.txt        |  4 ++--
 src/crimson/os/seastore/btree/btree_types.cc  | 10 +++++-----
 src/crimson/os/seastore/btree/btree_types.h   | 10 +++++-----
 .../os/seastore/btree/fixed_kv_btree.h        |  2 +-
 src/crimson/os/seastore/cache.cc              | 18 ++++++++---------
 .../btree => lba}/btree_lba_manager.cc        | 20 +++++++++----------
 .../btree => lba}/btree_lba_manager.h         |  4 ++--
 .../btree => lba}/lba_btree_node.cc           |  4 ++--
 .../btree => lba}/lba_btree_node.h            | 10 +++++-----
 src/crimson/os/seastore/lba_manager.cc        |  6 +++---
 src/crimson/os/seastore/lba_manager.h         |  2 +-
 src/crimson/os/seastore/lba_mapping.cc        |  2 +-
 src/crimson/os/seastore/lba_mapping.h         | 10 +++++-----
 src/crimson/os/seastore/logical_child_node.h  |  6 +++---
 src/crimson/os/seastore/root_block.cc         | 12 +++++------
 .../os/seastore/transaction_manager.cc        |  4 ++--
 src/crimson/os/seastore/transaction_manager.h |  2 +-
 .../seastore/test_btree_lba_manager.cc        |  5 ++---
 .../seastore/test_transaction_manager.cc      |  4 ++--
 19 files changed, 67 insertions(+), 68 deletions(-)
 rename src/crimson/os/seastore/{lba_manager/btree => lba}/btree_lba_manager.cc (98%)
 rename src/crimson/os/seastore/{lba_manager/btree => lba}/btree_lba_manager.h (99%)
 rename src/crimson/os/seastore/{lba_manager/btree => lba}/lba_btree_node.cc (94%)
 rename src/crimson/os/seastore/{lba_manager/btree => lba}/lba_btree_node.h (93%)

diff --git a/src/crimson/os/seastore/CMakeLists.txt b/src/crimson/os/seastore/CMakeLists.txt
index 0a7a11668c8fb..d5ca12d8f0670 100644
--- a/src/crimson/os/seastore/CMakeLists.txt
+++ b/src/crimson/os/seastore/CMakeLists.txt
@@ -15,8 +15,8 @@ set(crimson_seastore_srcs
   btree/btree_types.cc
   backref_manager.cc
   backref/btree_backref_manager.cc
-  lba_manager/btree/btree_lba_manager.cc
-  lba_manager/btree/lba_btree_node.cc
+  lba/btree_lba_manager.cc
+  lba/lba_btree_node.cc
   omap_manager.cc
   omap_manager/btree/btree_omap_manager.cc
   omap_manager/btree/omap_btree_node_impl.cc
diff --git a/src/crimson/os/seastore/btree/btree_types.cc b/src/crimson/os/seastore/btree/btree_types.cc
index a8d6e883153f6..7665b4a1b876e 100644
--- a/src/crimson/os/seastore/btree/btree_types.cc
+++ b/src/crimson/os/seastore/btree/btree_types.cc
@@ -2,12 +2,12 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "crimson/os/seastore/btree/btree_types.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/backref/backref_tree_node.h"
 
 namespace crimson::os::seastore {
 
-namespace lba_manager::btree {
+namespace lba {
 
 std::ostream& operator<<(std::ostream& out, const lba_map_val_t& v)
 {
@@ -19,7 +19,7 @@ std::ostream& operator<<(std::ostream& out, const lba_map_val_t& v)
              << ")";
 }
 
-} // namespace lba_manager::btree
+} // namespace lba
 
 namespace backref {
 
@@ -36,7 +36,7 @@ namespace {
 template <typename key_t, typename T>
 bool modified_since(T &&extent, uint64_t iter_modifications) {
   using backref::BackrefLeafNode;
-  using lba_manager::btree::LBALeafNode;
+  using lba::LBALeafNode;
   if constexpr (std::is_same_v<key_t, laddr_t>) {
     assert(extent->get_type() == extent_types_t::LADDR_LEAF);
     auto leaf = extent->template cast<LBALeafNode>();
@@ -64,7 +64,7 @@ bool BtreeCursor<key_t, val_t>::is_viewable() const {
   return viewable;
 }
 
-template struct BtreeCursor<laddr_t, lba_manager::btree::lba_map_val_t>;
+template struct BtreeCursor<laddr_t, lba::lba_map_val_t>;
 template struct BtreeCursor<paddr_t, backref::backref_map_val_t>;
 
 } // namespace crimson::os::seastore
diff --git a/src/crimson/os/seastore/btree/btree_types.h b/src/crimson/os/seastore/btree/btree_types.h
index cd616ee6e96ca..1a0d45fbc2a9e 100644
--- a/src/crimson/os/seastore/btree/btree_types.h
+++ b/src/crimson/os/seastore/btree/btree_types.h
@@ -100,7 +100,7 @@ struct __attribute__((packed)) fixed_kv_node_meta_le_t {
   }
 };
 
-namespace lba_manager::btree {
+namespace lba {
 
 /**
  * lba_map_val_t
@@ -150,7 +150,7 @@ struct __attribute__((packed)) lba_map_val_le_t {
   }
 };
 
-} // namespace lba_manager::btree
+} // namespace lba
 
 namespace backref {
 
@@ -216,7 +216,7 @@ struct BtreeCursor {
 	pos(pos)
   {
     if constexpr (std::is_same_v<key_t, laddr_t>) {
-      static_assert(std::is_same_v<val_t, lba_manager::btree::lba_map_val_t>,
+      static_assert(std::is_same_v<val_t, lba::lba_map_val_t>,
         "the value type of laddr_t for BtreeCursor should be lba_map_val_t");
     } else {
       static_assert(std::is_same_v<key_t, paddr_t>,
@@ -251,8 +251,8 @@ struct BtreeCursor {
   }
 };
 
-struct LBACursor : BtreeCursor<laddr_t, lba_manager::btree::lba_map_val_t> {
-  using Base = BtreeCursor<laddr_t, lba_manager::btree::lba_map_val_t>;
+struct LBACursor : BtreeCursor<laddr_t, lba::lba_map_val_t> {
+  using Base = BtreeCursor<laddr_t, lba::lba_map_val_t>;
   using Base::BtreeCursor;
   bool is_indirect() const {
     assert(!is_end());
diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index f9ca41863290f..103e24ad15155 100644
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -178,7 +178,7 @@ public:
       assert(!is_end());
       auto ret = leaf.node->iter_idx(leaf.pos).get_val();
       if constexpr (
-        std::is_same_v<crimson::os::seastore::lba_manager::btree::lba_map_val_t,
+        std::is_same_v<crimson::os::seastore::lba::lba_map_val_t,
                        node_val_t>) {
         if (ret.pladdr.is_paddr()) {
           ret.pladdr = ret.pladdr.get_paddr().maybe_relative_to(
diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index 7762d1344de3c..cf83fa93042fd 100644
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -14,7 +14,7 @@
 
 // included for get_extent_by_type
 #include "crimson/os/seastore/collection_manager/collection_flat_node.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.h"
 #include "crimson/os/seastore/object_data_handler.h"
 #include "crimson/os/seastore/collection_manager/collection_flat_node.h"
@@ -1090,9 +1090,9 @@ CachedExtentRef Cache::alloc_new_non_data_extent_by_type(
     ceph_assert(0 == "ROOT is never directly alloc'd");
     return CachedExtentRef();
   case extent_types_t::LADDR_INTERNAL:
-    return alloc_new_non_data_extent<lba_manager::btree::LBAInternalNode>(t, length, hint, gen);
+    return alloc_new_non_data_extent<lba::LBAInternalNode>(t, length, hint, gen);
   case extent_types_t::LADDR_LEAF:
-    return alloc_new_non_data_extent<lba_manager::btree::LBALeafNode>(
+    return alloc_new_non_data_extent<lba::LBALeafNode>(
       t, length, hint, gen);
   case extent_types_t::ROOT_META:
     return alloc_new_non_data_extent<RootMetaBlock>(
@@ -1449,7 +1449,7 @@ record_t Cache::prepare_record(
     if (i->is_logical()) {
       fresh_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
     } else if (is_lba_node(i->get_type())) {
-      fresh_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
+      fresh_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
     } else {
       fresh_laddr = L_ADDR_NULL;
     }
@@ -1468,7 +1468,7 @@ record_t Cache::prepare_record(
       if (i->is_logical()) {
 	alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
       } else if (is_lba_node(i->get_type())) {
-	alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
+	alloc_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
       } else {
 	assert(i->get_type() == extent_types_t::TEST_BLOCK_PHYSICAL);
 	alloc_laddr = L_ADDR_MIN;
@@ -1494,7 +1494,7 @@ record_t Cache::prepare_record(
         alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
       } else {
         assert(is_lba_node(i->get_type()));
-        alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
+        alloc_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
       }
       alloc_delta.alloc_blk_ranges.emplace_back(
 	alloc_blk_t::create_alloc(
@@ -1808,7 +1808,7 @@ void Cache::complete_commit(
       if (i->is_logical()) {
 	alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
       } else if (is_lba_node(i->get_type())) {
-	alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
+	alloc_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
       } else {
 	assert(i->get_type() == extent_types_t::TEST_BLOCK_PHYSICAL);
 	alloc_laddr = L_ADDR_MIN;
@@ -2253,13 +2253,13 @@ Cache::do_get_caching_extent_by_type(
 	return CachedExtentRef(extent.detach(), false /* add_ref */);
       });
     case extent_types_t::LADDR_INTERNAL:
-      return do_get_caching_extent<lba_manager::btree::LBAInternalNode>(
+      return do_get_caching_extent<lba::LBAInternalNode>(
 	offset, length, std::move(extent_init_func), std::move(on_cache), p_src
       ).safe_then([](auto extent) {
 	return CachedExtentRef(extent.detach(), false /* add_ref */);
       });
     case extent_types_t::LADDR_LEAF:
-      return do_get_caching_extent<lba_manager::btree::LBALeafNode>(
+      return do_get_caching_extent<lba::LBALeafNode>(
 	offset, length, std::move(extent_init_func), std::move(on_cache), p_src
       ).safe_then([](auto extent) {
 	return CachedExtentRef(extent.detach(), false /* add_ref */);
diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc
similarity index 98%
rename from src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
rename to src/crimson/os/seastore/lba/btree_lba_manager.cc
index 3f0700fd701cb..3c613dbbd27d4 100644
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -7,8 +7,8 @@
 #include <seastar/core/metrics.hh>
 
 #include "include/buffer.h"
-#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/btree_lba_manager.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/logging.h"
 
 SET_SUBSYS(seastore_lba);
@@ -20,10 +20,10 @@ SET_SUBSYS(seastore_lba);
  */
 
 template <> struct fmt::formatter<
-  crimson::os::seastore::lba_manager::btree::LBABtree::iterator>
+  crimson::os::seastore::lba::LBABtree::iterator>
     : public fmt::formatter<std::string_view>
 {
-  using Iter = crimson::os::seastore::lba_manager::btree::LBABtree::iterator;
+  using Iter = crimson::os::seastore::lba::LBABtree::iterator;
 
   template <typename FmtCtx>
   auto format(const Iter &iter, FmtCtx &ctx) const
@@ -45,7 +45,7 @@ Transaction::tree_stats_t& get_tree_stats(Transaction &t)
 
 template Transaction::tree_stats_t&
 get_tree_stats<
-  crimson::os::seastore::lba_manager::btree::LBABtree>(
+  crimson::os::seastore::lba::LBABtree>(
   Transaction &t);
 
 template <typename T>
@@ -56,11 +56,11 @@ phy_tree_root_t& get_phy_tree_root(root_t &r)
 
 template phy_tree_root_t&
 get_phy_tree_root<
-  crimson::os::seastore::lba_manager::btree::LBABtree>(root_t &r);
+  crimson::os::seastore::lba::LBABtree>(root_t &r);
 
 template <>
 const get_phy_tree_root_node_ret get_phy_tree_root_node<
-  crimson::os::seastore::lba_manager::btree::LBABtree>(
+  crimson::os::seastore::lba::LBABtree>(
   const RootBlockRef &root_block, op_context_t c)
 {
   auto lba_root = root_block->lba_root_node;
@@ -98,12 +98,12 @@ public:
   }
 };
 
-template class TreeRootLinker<RootBlock, lba_manager::btree::LBAInternalNode>;
-template class TreeRootLinker<RootBlock, lba_manager::btree::LBALeafNode>;
+template class TreeRootLinker<RootBlock, lba::LBAInternalNode>;
+template class TreeRootLinker<RootBlock, lba::LBALeafNode>;
 
 }
 
-namespace crimson::os::seastore::lba_manager::btree {
+namespace crimson::os::seastore::lba {
 
 BtreeLBAManager::mkfs_ret
 BtreeLBAManager::mkfs(
diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba/btree_lba_manager.h
similarity index 99%
rename from src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
rename to src/crimson/os/seastore/lba/btree_lba_manager.h
index 8a6698072b389..aef7325a370cd 100644
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.h
@@ -20,14 +20,14 @@
 #include "crimson/os/seastore/lba_manager.h"
 #include "crimson/os/seastore/cache.h"
 
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/btree/btree_types.h"
 
 namespace crimson::os::seastore {
 class LogicalCachedExtent;
 }
 
-namespace crimson::os::seastore::lba_manager::btree {
+namespace crimson::os::seastore::lba {
 
 using LBABtree = FixedKVBtree<
   laddr_t, lba_map_val_t, LBAInternalNode,
diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc b/src/crimson/os/seastore/lba/lba_btree_node.cc
similarity index 94%
rename from src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
rename to src/crimson/os/seastore/lba/lba_btree_node.cc
index 9cb62db9a4ef0..5ee0db2a13862 100644
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc
+++ b/src/crimson/os/seastore/lba/lba_btree_node.cc
@@ -10,13 +10,13 @@
 #include "include/buffer.h"
 #include "include/byteorder.h"
 
-#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
+#include "crimson/os/seastore/lba/btree_lba_manager.h"
 #include "crimson/os/seastore/logging.h"
 #include "crimson/os/seastore/logical_child_node.h"
 
 SET_SUBSYS(seastore_lba);
 
-namespace crimson::os::seastore::lba_manager::btree {
+namespace crimson::os::seastore::lba {
 
 std::ostream &LBALeafNode::print_detail(std::ostream &out) const
 {
diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h b/src/crimson/os/seastore/lba/lba_btree_node.h
similarity index 93%
rename from src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
rename to src/crimson/os/seastore/lba/lba_btree_node.h
index 85319466e103a..05f26b6b29273 100644
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h
+++ b/src/crimson/os/seastore/lba/lba_btree_node.h
@@ -24,7 +24,7 @@ namespace crimson::os::seastore {
 class LogicalChildNode;
 }
 
-namespace crimson::os::seastore::lba_manager::btree {
+namespace crimson::os::seastore::lba {
 
 using base_iertr = Cache::base_iertr;
 using LBANode = FixedKVNode<laddr_t>;
@@ -284,8 +284,8 @@ using LBALeafNodeRef = TCachedExtentRef<LBALeafNode>;
 }
 
 #if FMT_VERSION >= 90000
-template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::lba_node_meta_t> : fmt::ostream_formatter {};
-template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::lba_map_val_t> : fmt::ostream_formatter {};
-template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::LBAInternalNode> : fmt::ostream_formatter {};
-template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::LBALeafNode> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<crimson::os::seastore::lba::lba_node_meta_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<crimson::os::seastore::lba::lba_map_val_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<crimson::os::seastore::lba::LBAInternalNode> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<crimson::os::seastore::lba::LBALeafNode> : fmt::ostream_formatter {};
 #endif
diff --git a/src/crimson/os/seastore/lba_manager.cc b/src/crimson/os/seastore/lba_manager.cc
index 50850a7de56d1..3ebfb1dddf83c 100644
--- a/src/crimson/os/seastore/lba_manager.cc
+++ b/src/crimson/os/seastore/lba_manager.cc
@@ -2,12 +2,12 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "crimson/os/seastore/lba_manager.h"
-#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
+#include "crimson/os/seastore/lba/btree_lba_manager.h"
 
 namespace crimson::os::seastore {
 
-LBAManagerRef lba_manager::create_lba_manager(Cache &cache) {
-  return LBAManagerRef(new btree::BtreeLBAManager(cache));
+LBAManagerRef lba::create_lba_manager(Cache &cache) {
+  return LBAManagerRef(new lba::BtreeLBAManager(cache));
 }
 
 }
diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h
index 286496f3c71e9..d146a9932ece9 100644
--- a/src/crimson/os/seastore/lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager.h
@@ -241,7 +241,7 @@ public:
 using LBAManagerRef = std::unique_ptr<LBAManager>;
 
 class Cache;
-namespace lba_manager {
+namespace lba {
 LBAManagerRef create_lba_manager(Cache &cache);
 }
 
diff --git a/src/crimson/os/seastore/lba_mapping.cc b/src/crimson/os/seastore/lba_mapping.cc
index d52233869bbe2..77c564c2d7ebe 100644
--- a/src/crimson/os/seastore/lba_mapping.cc
+++ b/src/crimson/os/seastore/lba_mapping.cc
@@ -31,7 +31,7 @@ std::ostream &operator<<(std::ostream &out, const lba_mapping_list_t &rhs)
   return out << ']';
 }
 
-using lba_manager::btree::LBALeafNode;
+using lba::LBALeafNode;
 
 get_child_ret_t<LBALeafNode, LogicalChildNode>
 LBAMapping::get_logical_extent(Transaction &t)
diff --git a/src/crimson/os/seastore/lba_mapping.h b/src/crimson/os/seastore/lba_mapping.h
index 05f987e8def38..1f7e61d7073df 100644
--- a/src/crimson/os/seastore/lba_mapping.h
+++ b/src/crimson/os/seastore/lba_mapping.h
@@ -5,12 +5,12 @@
 
 #include "crimson/os/seastore/cached_extent.h"
 #include "crimson/os/seastore/btree/btree_types.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/logical_child_node.h"
 
 namespace crimson::os::seastore {
 
-namespace lba_manager::btree {
+namespace lba {
 class BtreeLBAManager;
 }
 
@@ -94,7 +94,7 @@ public:
     return direct_cursor->get_laddr();
   }
 
-   // An lba pin may be indirect, see comments in lba_manager/btree/btree_lba_manager.h
+   // An lba pin may be indirect, see comments in lba/btree_lba_manager.h
   laddr_t get_intermediate_key() const {
     assert(is_indirect());
     return indirect_cursor->get_intermediate_key();
@@ -117,7 +117,7 @@ public:
       extent_len_t>(get_intermediate_key());
   }
 
-  get_child_ret_t<lba_manager::btree::LBALeafNode, LogicalChildNode>
+  get_child_ret_t<lba::LBALeafNode, LogicalChildNode>
   get_logical_extent(Transaction &t);
 
   LBAMapping duplicate() const {
@@ -132,7 +132,7 @@ public:
   }
 
 private:
-  friend lba_manager::btree::BtreeLBAManager;
+  friend lba::BtreeLBAManager;
 
   // To support cloning, there are two kinds of lba mappings:
   //    1. direct lba mapping: the pladdr in the value of which is the paddr of
diff --git a/src/crimson/os/seastore/logical_child_node.h b/src/crimson/os/seastore/logical_child_node.h
index ab4f2e67262c8..b17d5c17bc453 100644
--- a/src/crimson/os/seastore/logical_child_node.h
+++ b/src/crimson/os/seastore/logical_child_node.h
@@ -6,16 +6,16 @@
 #include "crimson/os/seastore/cached_extent.h"
 #include "crimson/os/seastore/linked_tree_node.h"
 #include "crimson/os/seastore/btree/btree_types.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 
 namespace crimson::os::seastore {
 
 class LogicalChildNode : public LogicalCachedExtent,
-			 public ChildNode<lba_manager::btree::LBALeafNode,
+			 public ChildNode<lba::LBALeafNode,
 					  LogicalChildNode,
 					  laddr_t> {
   using lba_child_node_t = ChildNode<
-    lba_manager::btree::LBALeafNode, LogicalChildNode, laddr_t>;
+    lba::LBALeafNode, LogicalChildNode, laddr_t>;
 public:
   template <typename... T>
   LogicalChildNode(T&&... t) : LogicalCachedExtent(std::forward<T>(t)...) {}
diff --git a/src/crimson/os/seastore/root_block.cc b/src/crimson/os/seastore/root_block.cc
index c422442f5e000..afc5494a026e6 100644
--- a/src/crimson/os/seastore/root_block.cc
+++ b/src/crimson/os/seastore/root_block.cc
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "crimson/os/seastore/root_block.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/backref/backref_tree_node.h"
 #include "crimson/os/seastore/linked_tree_node.h"
 
@@ -14,17 +14,17 @@ void RootBlock::on_replace_prior() {
     if (prior.lba_root_node) {
       RootBlockRef this_ref = this;
       auto lba_root = static_cast<
-	lba_manager::btree::LBANode*>(prior.lba_root_node);
+	lba::LBANode*>(prior.lba_root_node);
       if (likely(lba_root->range.depth > 1)) {
-	TreeRootLinker<RootBlock, lba_manager::btree::LBAInternalNode>::link_root(
+	TreeRootLinker<RootBlock, lba::LBAInternalNode>::link_root(
 	  this_ref,
-	  static_cast<lba_manager::btree::LBAInternalNode*>(prior.lba_root_node)
+	  static_cast<lba::LBAInternalNode*>(prior.lba_root_node)
 	);
       } else {
 	assert(lba_root->range.depth == 1);
-	TreeRootLinker<RootBlock, lba_manager::btree::LBALeafNode>::link_root(
+	TreeRootLinker<RootBlock, lba::LBALeafNode>::link_root(
 	  this_ref,
-	  static_cast<lba_manager::btree::LBALeafNode*>(prior.lba_root_node)
+	  static_cast<lba::LBALeafNode*>(prior.lba_root_node)
 	);
       }
     }
diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index 3a2ce9efe6e7e..65d70ee5e4d4f 100644
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -8,7 +8,7 @@
 #include "crimson/os/seastore/transaction_manager.h"
 #include "crimson/os/seastore/journal.h"
 #include "crimson/os/seastore/journal/circular_bounded_journal.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/random_block_manager/rbm_device.h"
 
 /*
@@ -805,7 +805,7 @@ TransactionManagerRef make_transaction_manager(
 {
   auto epm = std::make_unique<ExtentPlacementManager>();
   auto cache = std::make_unique<Cache>(*epm);
-  auto lba_manager = lba_manager::create_lba_manager(*cache);
+  auto lba_manager = lba::create_lba_manager(*cache);
   auto sms = std::make_unique<SegmentManagerGroup>();
   auto rbs = std::make_unique<RBMDeviceGroup>();
   auto backref_manager = create_backref_manager(*cache);
diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h
index 9d2c9dda88257..6fca3bd2966f9 100644
--- a/src/crimson/os/seastore/transaction_manager.h
+++ b/src/crimson/os/seastore/transaction_manager.h
@@ -951,7 +951,7 @@ private:
 
   shard_stats_t& shard_stats;
 
-  using LBALeafNode = lba_manager::btree::LBALeafNode;
+  using LBALeafNode = lba::LBALeafNode;
   struct unlinked_child_t {
     LBAMapping mapping;
     child_pos_t<LBALeafNode> child_pos;
diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc
index 4f055cbade4cf..a74186ae25f0a 100644
--- a/src/test/crimson/seastore/test_btree_lba_manager.cc
+++ b/src/test/crimson/seastore/test_btree_lba_manager.cc
@@ -8,7 +8,7 @@
 #include "crimson/os/seastore/journal.h"
 #include "crimson/os/seastore/cache.h"
 #include "crimson/os/seastore/segment_manager/ephemeral.h"
-#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
+#include "crimson/os/seastore/lba/btree_lba_manager.h"
 
 #include "test/crimson/seastore/test_block.h"
 
@@ -21,8 +21,7 @@ namespace {
 using namespace crimson;
 using namespace crimson::os;
 using namespace crimson::os::seastore;
-using namespace crimson::os::seastore::lba_manager;
-using namespace crimson::os::seastore::lba_manager::btree;
+using namespace crimson::os::seastore::lba;
 
 struct btree_test_base :
   public seastar_test_suite_t, SegmentProvider, JournalTrimmer {
diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc
index 6244f6e80d9a6..514edc0407ff0 100644
--- a/src/test/crimson/seastore/test_transaction_manager.cc
+++ b/src/test/crimson/seastore/test_transaction_manager.cc
@@ -14,7 +14,7 @@
 #include "crimson/os/seastore/segment_manager.h"
 
 #include "test/crimson/seastore/test_block.h"
-#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
+#include "crimson/os/seastore/lba/lba_btree_node.h"
 
 using namespace crimson;
 using namespace crimson::os;
@@ -2118,7 +2118,7 @@ TEST_P(tm_single_device_intergrity_check_test_t, remap_lazy_read)
 TEST_P(tm_single_device_test_t, invalid_lba_mapping_detect)
 {
   run_async([this] {
-    using namespace crimson::os::seastore::lba_manager::btree;
+    using namespace crimson::os::seastore::lba;
     {
       auto t = create_transaction();
       for (unsigned i = 0; i < LEAF_NODE_CAPACITY; i++) {
-- 
2.39.5