Skip to content

Commit feef6aa

Browse files
committed
btrfs-progs: kernel-lib: remove radix-tree
The radix-tree is not used in userspace code. In kernel it's for tracking unpersisted and in-memory structures and has been replaced by the xarray. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 7b7492d commit feef6aa

File tree

14 files changed

+0
-961
lines changed

14 files changed

+0
-961
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \
147147

148148
objects = \
149149
kernel-lib/list_sort.o \
150-
kernel-lib/radix-tree.o \
151150
kernel-lib/raid56.o \
152151
kernel-lib/rbtree.o \
153152
kernel-lib/tables.o \

btrfs-corrupt-block.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <limits.h>
2424
#include <errno.h>
2525
#include <string.h>
26-
#include "kernel-lib/radix-tree.h"
2726
#include "kernel-shared/ctree.h"
2827
#include "kernel-shared/volumes.h"
2928
#include "kernel-shared/disk-io.h"
@@ -1430,7 +1429,6 @@ int main(int argc, char **argv)
14301429
return 1;
14311430
dev = argv[optind];
14321431

1433-
radix_tree_init();
14341432
cache_tree_init(&root_cache);
14351433

14361434
root = open_ctree(dev, 0, OPEN_CTREE_WRITES);

btrfs-map-logical.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <errno.h>
2626
#include <string.h>
2727
#include "kernel-lib/sizes.h"
28-
#include "kernel-lib/radix-tree.h"
2928
#include "kernel-shared/ctree.h"
3029
#include "kernel-shared/extent_io.h"
3130
#include "kernel-shared/volumes.h"
@@ -264,7 +263,6 @@ int main(int argc, char **argv)
264263

265264
dev = argv[optind];
266265

267-
radix_tree_init();
268266
cache_tree_init(&root_cache);
269267

270268
root = open_ctree(dev, 0, 0);

btrfs-select-super.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <stdlib.h>
2222
#include <errno.h>
2323
#include <getopt.h>
24-
#include "kernel-lib/radix-tree.h"
2524
#include "kernel-shared/ctree.h"
2625
#include "kernel-shared/volumes.h"
2726
#include "kernel-shared/disk-io.h"
@@ -73,8 +72,6 @@ int main(int argc, char **argv)
7372
print_usage();
7473
}
7574

76-
radix_tree_init();
77-
7875
if((ret = check_mounted(argv[optind])) < 0) {
7976
errno = -ret;
8077
error("cannot check mount status: %m");

check/main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <string.h>
2929
#include <time.h>
3030
#include <uuid/uuid.h>
31-
#include "kernel-lib/radix-tree.h"
3231
#include "kernel-lib/list.h"
3332
#include "kernel-lib/rbtree.h"
3433
#include "kernel-lib/rbtree_types.h"
@@ -10690,7 +10689,6 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
1069010689

1069110690
printf("Opening filesystem to check...\n");
1069210691

10693-
radix_tree_init();
1069410692
cache_tree_init(&root_cache);
1069510693
qgroup_set_item_count_ptr(&ctx.item_count);
1069610694

0 commit comments

Comments
 (0)