btrfs-progs: build: drop kernel-lib from -I and update paths

Include the files by full path to avoid any confusion in case of potentially duplicate names. Signed-off-by: David Sterba <[email protected]>
kdave · Jul 3, 2019 · 94fced6 · 94fced6
1 parent c07960c
commit 94fced6
Show file tree

Hide file tree

Showing 54 changed files with 72 additions and 74 deletions.
diff --git a/Makefile b/Makefile
@@ -82,7 +82,6 @@ CFLAGS = $(SUBST_CFLAGS) \
 	 -fno-strict-aliasing \
 	 -fPIC \
 	 -I$(TOPDIR) \
-	 -I$(TOPDIR)/kernel-lib \
 	 -I$(TOPDIR)/libbtrfsutil \
 	 $(DISABLE_WARNING_FLAGS) \
 	 $(EXTRAWARN_CFLAGS) \

diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c
@@ -29,7 +29,7 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "common/utils.h"
 #include "common/help.h"
 

diff --git a/btrfs-crc.c b/btrfs-crc.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "common/utils.h"
 
 void print_usage(int status)

diff --git a/btrfs-find-root.c b/btrfs-find-root.c
@@ -29,10 +29,10 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "volumes.h"
 #include "common/utils.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "extent-cache.h"
 #include "find-root.h"
 #include "common/help.h"

diff --git a/btrfs-list.h b/btrfs-list.h
@@ -21,7 +21,7 @@
 
 #if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
-#include "rbtree.h"
+#include "kernel-lib/rbtree.h"
 #include "ioctl.h"
 #else
 #include <btrfs/kerncompat.h>

diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c
@@ -27,7 +27,7 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "common/utils.h"
 #include "common/help.h"
 

diff --git a/btrfs-sb-mod.c b/btrfs-sb-mod.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <limits.h>
 #include <byteswap.h>
-#include <kernel-lib/crc32c.h>
+#include "kernel-lib/crc32c.h"
 #include "disk-io.h"
 
 #define BLOCKSIZE (4096)

diff --git a/btrfs-select-super.c b/btrfs-select-super.c
@@ -27,7 +27,7 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "common/utils.h"
 #include "common/help.h"
 

diff --git a/btrfs.c b/btrfs.c
@@ -20,7 +20,7 @@
 #include <getopt.h>
 
 #include "volumes.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "cmds/commands.h"
 #include "common/utils.h"
 #include "common/help.h"

diff --git a/btrfsck.h b/btrfsck.h
@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "extent-cache.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #else
 #include <btrfs/kerncompat.h>
 #include <btrfs/ctree.h>

diff --git a/cmds/filesystem-du.c b/cmds/filesystem-du.c
@@ -37,9 +37,9 @@
 #include "common/utils.h"
 #include "cmds/commands.h"
 #include "kerncompat.h"
-#include "rbtree.h"
+#include "kernel-lib/rbtree.h"
 
-#include "interval_tree_generic.h"
+#include "kernel-lib/interval_tree_generic.h"
 #include "common/help.h"
 #include "common/fsfeatures.h"
 

diff --git a/cmds/filesystem.c b/cmds/filesystem.c
@@ -37,7 +37,7 @@
 #include "volumes.h"
 #include "cmds/commands.h"
 #include "cmds/filesystem-usage.h"
-#include "list_sort.h"
+#include "kernel-lib/list_sort.h"
 #include "disk-io.h"
 #include "common/help.h"
 #include "common/fsfeatures.h"

diff --git a/cmds/inspect-dump-super.c b/cmds/inspect-dump-super.c
@@ -29,10 +29,10 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "common/utils.h"
 #include "cmds/commands.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "common/help.h"
 
 static int check_csum_sblock(void *sb, int csum_size)

diff --git a/cmds/inspect-dump-tree.c b/cmds/inspect-dump-tree.c
@@ -23,7 +23,7 @@
 #include <getopt.h>
 
 #include "kerncompat.h"
-#include "radix-tree.h"
+#include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "print-tree.h"

diff --git a/cmds/inspect-tree-stats.c b/cmds/inspect-tree-stats.c
@@ -31,7 +31,7 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "cmds/commands.h"

diff --git a/cmds/receive.c b/cmds/receive.c
@@ -43,7 +43,7 @@
 #include "ioctl.h"
 #include "cmds/commands.h"
 #include "common/utils.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "btrfs-list.h"
 
 #include "send.h"

diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c
@@ -29,14 +29,14 @@
 #include <uuid/uuid.h>
 #include <pthread.h>
 
-#include "list.h"
-#include "radix-tree.h"
+#include "kernel-lib/list.h"
+#include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "extent-cache.h"
 #include "disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "common/utils.h"
 #include "btrfsck.h"
 #include "cmds/commands.h"

diff --git a/cmds/rescue-super-recover.c b/cmds/rescue-super-recover.c
@@ -29,9 +29,9 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "disk-io.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "common/utils.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "volumes.h"
 #include "cmds/commands.h"
 #include "cmds/rescue.h"

diff --git a/cmds/restore.c b/cmds/restore.c
@@ -41,7 +41,7 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "cmds/commands.h"

diff --git a/cmds/send.c b/cmds/send.c
@@ -38,7 +38,7 @@
 #include "ctree.h"
 #include "ioctl.h"
 #include "cmds/commands.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "common/utils.h"
 
 #include "send.h"

diff --git a/common/utils.c b/common/utils.c
@@ -43,11 +43,11 @@
 #include <btrfsutil.h>
 
 #include "kerncompat.h"
-#include "radix-tree.h"
+#include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "common/utils.h"
 #include "volumes.h"
 #include "ioctl.h"

diff --git a/common/utils.h b/common/utils.h
@@ -26,7 +26,7 @@
 #include "common-defs.h"
 #include "common/internal.h"
 #include "btrfs-list.h"
-#include "sizes.h"
+#include "kernel-lib/sizes.h"
 #include "common/messages.h"
 #include "ioctl.h"
 #include "common/fsfeatures.h"

diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c
@@ -25,7 +25,7 @@
 #include "disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
-#include "bitops.h"
+#include "kernel-lib/bitops.h"
 #include "convert/common.h"
 #include "convert/source-reiserfs.h"
 

diff --git a/ctree.c b/ctree.c
@@ -21,7 +21,7 @@
 #include "print-tree.h"
 #include "repair.h"
 #include "common/internal.h"
-#include "sizes.h"
+#include "kernel-lib/sizes.h"
 #include "common/messages.h"
 #include "volumes.h"
 

diff --git a/ctree.h b/ctree.h
@@ -22,13 +22,13 @@
 #include <stdbool.h>
 
 #if BTRFS_FLAT_INCLUDES
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "kerncompat.h"
-#include "radix-tree.h"
+#include "kernel-lib/radix-tree.h"
 #include "extent-cache.h"
 #include "extent_io.h"
 #include "ioctl.h"
-#include "sizes.h"
+#include "kernel-lib/sizes.h"
 #else
 #include <btrfs/list.h>
 #include <btrfs/kerncompat.h>

diff --git a/disk-io.c b/disk-io.c
@@ -24,12 +24,12 @@
 #include <unistd.h>
 #include <uuid/uuid.h>
 #include "kerncompat.h"
-#include "radix-tree.h"
+#include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "common/utils.h"
 #include "print-tree.h"
 #include "rbtree-utils.h"

diff --git a/disk-io.h b/disk-io.h
@@ -21,7 +21,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "sizes.h"
+#include "kernel-lib/sizes.h"
 
 #define BTRFS_SUPER_INFO_OFFSET SZ_64K
 #define BTRFS_SUPER_INFO_SIZE 4096

diff --git a/extent-cache.h b/extent-cache.h
@@ -21,7 +21,7 @@
 
 #if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
-#include "rbtree.h"
+#include "kernel-lib/rbtree.h"
 #else
 #include <btrfs/kerncompat.h>
 #include <btrfs/rbtree.h>

diff --git a/extent-tree.c b/extent-tree.c
@@ -21,12 +21,12 @@
 #include <stdint.h>
 #include <math.h>
 #include "kerncompat.h"
-#include "radix-tree.h"
+#include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "volumes.h"
 #include "free-space-cache.h"
 #include "free-space-tree.h"

diff --git a/extent_io.c b/extent_io.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include "kerncompat.h"
 #include "extent_io.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "ctree.h"
 #include "volumes.h"
 #include "common/utils.h"

diff --git a/extent_io.h b/extent_io.h
@@ -22,7 +22,7 @@
 #if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
 #include "extent-cache.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #else
 #include <btrfs/kerncompat.h>
 #include <btrfs/extent-cache.h>

diff --git a/file-item.c b/file-item.c
@@ -19,12 +19,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "kerncompat.h"
-#include "radix-tree.h"
+#include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
 #include "print-tree.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "common/internal.h"
 
 #define MAX_CSUM_ITEMS(r, size) ((((BTRFS_LEAF_DATA_SIZE(r->fs_info) - \

diff --git a/find-root.h b/find-root.h
@@ -22,7 +22,7 @@
 #include "kerncompat.h"
 
 #include "ctree.h"
-#include "list.h"
+#include "kernel-lib/list.h"
 #include "extent-cache.h"
 
 /*

diff --git a/free-space-cache.c b/free-space-cache.c
@@ -22,8 +22,8 @@
 #include "transaction.h"
 #include "disk-io.h"
 #include "extent_io.h"
-#include "crc32c.h"
-#include "bitops.h"
+#include "kernel-lib/crc32c.h"
+#include "kernel-lib/bitops.h"
 #include "common/internal.h"
 #include "common/utils.h"
 

diff --git a/free-space-cache.h b/free-space-cache.h
@@ -21,7 +21,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "rbtree.h"
+#include "kernel-lib/rbtree.h"
 
 struct btrfs_free_space {
 	struct rb_node offset_index;

diff --git a/free-space-tree.c b/free-space-tree.c
@@ -22,7 +22,7 @@
 #include "free-space-tree.h"
 #include "volumes.h"
 #include "transaction.h"
-#include "bitops.h"
+#include "kernel-lib/bitops.h"
 #include "common/internal.h"
 
 static struct btrfs_free_space_info *

diff --git a/hash.h b/hash.h
@@ -19,7 +19,7 @@
 #ifndef __BTRFS_HASH_H__
 #define __BTRFS_HASH_H__
 
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 
 static inline u64 btrfs_name_hash(const char *name, int len)
 {

diff --git a/image/main.c b/image/main.c
@@ -28,7 +28,7 @@
 #include <getopt.h>
 
 #include "kerncompat.h"
-#include "crc32c.h"
+#include "kernel-lib/crc32c.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"