CORTX-33757: Move new btree code files to be directory (#2025)

Problem:
Currently new btree code resides in btree directory,
move the new btree code to 'be' directory and rename
internal.h -> btree_internal.h

Solution:
Move btree code to 'be' directory and make necessary
changes for the same

Signed-off-by: Prasanna Kulkarni <[email protected]>

Author: Prasanna Dattatraya Kulkarni

Kbuild.in

@@ -65,7 +65,6 @@ include $(src)/m0t1fs/Kbuild.sub
 include $(src)/addb2/Kbuild.sub
 include $(src)/balloc/Kbuild.sub
 include $(src)/be/Kbuild.sub
-include $(src)/btree/Kbuild.sub
 include $(src)/cas/Kbuild.sub
 include $(src)/motr/Kbuild.sub
 include $(src)/conf/Kbuild.sub

Makefile.am

@@ -209,7 +209,6 @@ include $(top_srcdir)/addb2/st/Makefile.sub
 include $(top_srcdir)/balloc/Makefile.sub
 include $(top_srcdir)/be/Makefile.sub
 include $(top_srcdir)/be/tool/Makefile.sub
-include $(top_srcdir)/btree/Makefile.sub
 include $(top_srcdir)/capa/Makefile.sub
 include $(top_srcdir)/cas/Makefile.sub
 include $(top_srcdir)/cm/Makefile.sub
@@ -1126,7 +1125,6 @@ EXTRA_DIST += \
               balloc/Kbuild.sub \
               be/Kbuild.sub \
               be/ut/Kbuild.sub \
-              btree/Kbuild.sub \
               cas/Kbuild.sub \
               cob/Kbuild.sub \
               motr/Kbuild.sub\

balloc/balloc.h

@@ -29,7 +29,7 @@
 #include "lib/types.h"
 #include "lib/list.h"
 #include "lib/mutex.h"
-#include "btree/btree.h"
+#include "be/btree.h"
 #include "format/format.h"
 #include "stob/ad.h"
 #include "stob/ad_xc.h"

be/Kbuild.sub

@@ -2,6 +2,7 @@ m0tr_objects += \
                   be/addb2_xc.o \
                   be/alloc_xc.o \
                   be/alloc_internal_xc.o \
+                  be/btree.o \
                   be/domain_xc.o \
                   be/extmap.o \
                   be/extmap_xc.o \

be/Makefile.sub

@@ -4,6 +4,8 @@ nobase_motr_include_HEADERS += \
                                be/alloc_internal.h  \
                                be/active_record.h   \
                                be/be.h              \
+                               be/btree.h           \
+                               be/btree_internal.h  \
 			       be/domain.h          \
 			       be/engine.h          \
                                be/extmap_internal.h \
@@ -43,6 +45,7 @@ nobase_motr_include_HEADERS += \
 motr_libmotr_la_SOURCES += be/alloc.c           \
                            be/active_record.c   \
 			   be/be.c              \
+			   be/btree.c           \
 			   be/domain.c          \
 			   be/engine.c          \
 			   be/extmap.c          \

be/be.c

@@ -27,7 +27,7 @@
 
 #include "be/tx_group_fom.h"    /* m0_be_tx_group_fom_mod_init */
 #include "be/tx_internal.h"     /* m0_be_tx_mod_init */
-#include "btree/btree.h"
+#include "be/btree.h"
 
 /**
  * @addtogroup be

be/be.h

@@ -48,7 +48,7 @@
  * - m0_be_tx_credit (be/tx_credit.h);
  * - m0_be_op        (be/op.h);
  * - m0_be_allocator (be/alloc.h);
- * - m0_btree        (btree/btree.h);
+ * - m0_btree        (be/btree.h);
  * - m0_be_list      (be/list.h);
  * - m0_be_emap      (be/extmap.h);
  * - m0_be_0type     (be/seg0.h);

btree/btree.c renamed to be/btree.c

@@ -550,7 +550,7 @@
 #include "lib/bitmap.h"     /** struct m0_bitmap */
 #include "lib/byteorder.h"  /** m0_byteorder_cpu_to_be64() */
 #include "lib/atomic.h"     /** m0_atomic64_set() */
-#include "btree/btree.h"
+#include "be/btree.h"
 #include "format/format.h"   /** m0_format_header ff_fmt */
 #include "module/instance.h"
 #include "lib/memory.h"

btree/btree.h renamed to be/btree.h

@@ -725,7 +725,7 @@ M0_INTERNAL void m0_btree_del_credit2(const struct m0_btree_type *type,
 				      m0_bcount_t                 vsize,
 				      struct m0_be_tx_credit     *accum);
 
-#include "btree/internal.h"
+#include "be/btree_internal.h"
 
 M0_INTERNAL int     m0_btree_mod_init(void);
 M0_INTERNAL void    m0_btree_mod_fini(void);