crimson/os/seastore/FixedKVBtree: correct MAX_DEPTH

Signed-off-by: Zhang Song <zhangsong02@qianxin.com>

diff --git a/src/crimson/os/seastore/btree/btree_types.h b/src/crimson/os/seastore/btree/btree_types.h
index 1a0d45fbc2a9e293a2172e7e5d6e68b43e581555..e3e8ca1f7e6c964bfb47c1455a7b0f7d2a76e21b 100644 (file)
--- a/src/crimson/os/seastore/btree/btree_types.h
+++ b/src/crimson/os/seastore/btree/btree_types.h
@@ -19,8 +19,6 @@ struct op_context_t {
   Transaction &trans;
 };
 
-constexpr uint16_t MAX_FIXEDKVBTREE_DEPTH = 8;
-
 template <typename bound_t>
 struct fixed_kv_node_meta_t {
   bound_t begin = min_max_t<bound_t>::min;

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index 61c0769a06da17b4fd82d38e3232f300d7daf449..8cf870bceee1fea1f5525dade2165d3ac764939d 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -40,7 +40,7 @@ template <
   typename cursor_t,
   size_t node_size>
 class FixedKVBtree {
-  static constexpr size_t MAX_DEPTH = 16;
+  static constexpr size_t MAX_DEPTH = 8;
   using self_type = FixedKVBtree<
     node_key_t,
     node_val_t,
@@ -1778,7 +1778,7 @@ private:
         c.trans, root_block)->template cast<RootBlock>();
       get_root().set_location(nroot->get_paddr());
       get_root().set_depth(iter.get_depth());
-      ceph_assert(get_root().get_depth() <= MAX_FIXEDKVBTREE_DEPTH);
+      ceph_assert(get_root().get_depth() <= MAX_DEPTH);
       set_root_node(nroot);
     }