From c07960c8bed732b10ae9bf84006eaf244db54cd8 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 20 Jun 2019 01:46:21 +0200 Subject: [PATCH] btrfs-progs: move utils.[ch] to common/ Update include paths and remove some duplicates. Signed-off-by: David Sterba --- Makefile | 2 +- btrfs-corrupt-block.c | 2 +- btrfs-crc.c | 2 +- btrfs-find-root.c | 2 +- btrfs-fragments.c | 2 +- btrfs-list.c | 2 +- btrfs-map-logical.c | 2 +- btrfs-select-super.c | 2 +- btrfs.c | 2 +- btrfstune.c | 2 +- check/main.c | 2 +- check/mode-common.c | 2 +- check/mode-lowmem.c | 2 +- cmds/balance.c | 2 +- cmds/device.c | 2 +- cmds/filesystem-du.c | 2 +- cmds/filesystem-usage.c | 2 +- cmds/filesystem.c | 2 +- cmds/inspect-dump-super.c | 2 +- cmds/inspect-dump-tree.c | 2 +- cmds/inspect-tree-stats.c | 2 +- cmds/inspect.c | 2 +- cmds/property.c | 2 +- cmds/qgroup.c | 2 +- cmds/quota.c | 2 +- cmds/receive.c | 2 +- cmds/replace.c | 2 +- cmds/rescue-chunk-recover.c | 2 +- cmds/rescue-super-recover.c | 2 +- cmds/rescue.c | 2 +- cmds/restore.c | 2 +- cmds/scrub.c | 2 +- cmds/send.c | 2 +- cmds/subvolume.c | 3 +-- common/fsfeatures.c | 2 +- common/help.c | 2 +- utils.c => common/utils.c | 2 +- utils.h => common/utils.h | 0 convert/common.c | 2 +- convert/main.c | 2 +- convert/source-ext2.c | 2 +- convert/source-reiserfs.c | 2 +- disk-io.c | 2 +- extent-tree.c | 2 +- extent_io.c | 2 +- file.c | 2 +- find-root.c | 2 +- free-space-cache.c | 2 +- image/main.c | 2 +- image/sanitize.c | 2 +- kernel-lib/raid56.c | 2 +- mkfs/common.c | 2 +- mkfs/main.c | 2 +- mkfs/rootdir.c | 2 +- print-tree.c | 3 +-- props.c | 2 +- qgroup-verify.c | 2 +- qgroup.c | 2 +- repair.c | 2 +- send-dump.c | 2 +- send-stream.c | 2 +- utils-lib.c | 4 +--- uuid-tree.c | 2 +- volumes.c | 2 +- 64 files changed, 63 insertions(+), 67 deletions(-) rename utils.c => common/utils.c (99%) rename utils.h => common/utils.h (100%) diff --git a/Makefile b/Makefile index 97c36473..7f7b1194 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \ root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \ - extent-cache.o extent_io.o volumes.o utils.o repair.o \ + extent-cache.o extent_io.o volumes.o common/utils.o repair.o \ qgroup.o free-space-cache.o kernel-lib/list_sort.o props.o \ kernel-shared/ulist.o qgroup-verify.o backref.o common/string-table.o \ common/task-utils.o \ diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 10e6756a..760198eb 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -30,7 +30,7 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" #define FIELD_BUF_LEN 80 diff --git a/btrfs-crc.c b/btrfs-crc.c index 8202b316..635dd492 100644 --- a/btrfs-crc.c +++ b/btrfs-crc.c @@ -20,7 +20,7 @@ #include #include #include "crc32c.h" -#include "utils.h" +#include "common/utils.h" void print_usage(int status) { diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 1e76f554..96d9837e 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -31,7 +31,7 @@ #include "transaction.h" #include "list.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "crc32c.h" #include "extent-cache.h" #include "find-root.h" diff --git a/btrfs-fragments.c b/btrfs-fragments.c index 360c38ed..4209011d 100644 --- a/btrfs-fragments.c +++ b/btrfs-fragments.c @@ -35,7 +35,7 @@ #include "kerncompat.h" #include "ctree.h" #include "ioctl.h" -#include "utils.h" +#include "common/utils.h" static int use_color; static void diff --git a/btrfs-list.c b/btrfs-list.c index adda45ab..7da5a417 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -28,7 +28,7 @@ #include #include "ctree.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "ioctl.h" #include #include "btrfs-list.h" diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index 7cecbe08..308f3d0a 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -28,7 +28,7 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" #define BUFFER_SIZE SZ_64K diff --git a/btrfs-select-super.c b/btrfs-select-super.c index 5e84b31e..5d953a26 100644 --- a/btrfs-select-super.c +++ b/btrfs-select-super.c @@ -28,7 +28,7 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static void print_usage(void) diff --git a/btrfs.c b/btrfs.c index 7a78efa2..d9d9059a 100644 --- a/btrfs.c +++ b/btrfs.c @@ -22,7 +22,7 @@ #include "volumes.h" #include "crc32c.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static const char * const btrfs_cmd_group_usage[] = { diff --git a/btrfstune.c b/btrfstune.c index aa162d4c..ce028474 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -30,7 +30,7 @@ #include "ctree.h" #include "disk-io.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "common/help.h" diff --git a/check/main.c b/check/main.c index 72a55daf..8688a4ad 100644 --- a/check/main.c +++ b/check/main.c @@ -33,7 +33,7 @@ #include "print-tree.h" #include "common/task-utils.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "cmds/commands.h" #include "free-space-cache.h" #include "free-space-tree.h" diff --git a/check/mode-common.c b/check/mode-common.c index b9150408..d5f6c8ef 100644 --- a/check/mode-common.c +++ b/check/mode-common.c @@ -19,7 +19,7 @@ #include "common/internal.h" #include "common/messages.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "disk-io.h" #include "repair.h" #include "check/mode-common.h" diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 4959f401..a2be0e6d 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -23,7 +23,7 @@ #include "backref.h" #include "hash.h" #include "common/internal.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "check/mode-common.h" #include "check/mode-lowmem.h" diff --git a/cmds/balance.c b/cmds/balance.c index 8476df17..6f2d4803 100644 --- a/cmds/balance.c +++ b/cmds/balance.c @@ -31,7 +31,7 @@ #include "volumes.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static const char * const balance_cmd_group_usage[] = { diff --git a/cmds/device.c b/cmds/device.c index f9b8a6be..a79f4040 100644 --- a/cmds/device.c +++ b/cmds/device.c @@ -27,7 +27,7 @@ #include "kerncompat.h" #include "ctree.h" #include "ioctl.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "cmds/filesystem-usage.h" diff --git a/cmds/filesystem-du.c b/cmds/filesystem-du.c index 78979e6f..acb7ee73 100644 --- a/cmds/filesystem-du.c +++ b/cmds/filesystem-du.c @@ -34,7 +34,7 @@ #define FIEMAP_EXTENT_SHARED 0x00002000 #endif -#include "utils.h" +#include "common/utils.h" #include "cmds/commands.h" #include "kerncompat.h" #include "rbtree.h" diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c index b2bf92a7..1979cfed 100644 --- a/cmds/filesystem-usage.c +++ b/cmds/filesystem-usage.c @@ -24,7 +24,7 @@ #include #include -#include "utils.h" +#include "common/utils.h" #include "kerncompat.h" #include "ctree.h" #include "common/string-table.h" diff --git a/cmds/filesystem.c b/cmds/filesystem.c index d549d3d6..751c647c 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -33,7 +33,7 @@ #include "kerncompat.h" #include "ctree.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "cmds/commands.h" #include "cmds/filesystem-usage.h" diff --git a/cmds/inspect-dump-super.c b/cmds/inspect-dump-super.c index 9d077bc3..15c5c10f 100644 --- a/cmds/inspect-dump-super.c +++ b/cmds/inspect-dump-super.c @@ -30,7 +30,7 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "utils.h" +#include "common/utils.h" #include "cmds/commands.h" #include "crc32c.h" #include "common/help.h" diff --git a/cmds/inspect-dump-tree.c b/cmds/inspect-dump-tree.c index d93dfe07..bbbfeb76 100644 --- a/cmds/inspect-dump-tree.c +++ b/cmds/inspect-dump-tree.c @@ -30,7 +30,7 @@ #include "transaction.h" #include "volumes.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static void print_extents(struct extent_buffer *eb) diff --git a/cmds/inspect-tree-stats.c b/cmds/inspect-tree-stats.c index ba0b09e3..51e18cbe 100644 --- a/cmds/inspect-tree-stats.c +++ b/cmds/inspect-tree-stats.c @@ -33,7 +33,7 @@ #include "transaction.h" #include "list.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "cmds/commands.h" #include "common/help.h" diff --git a/cmds/inspect.c b/cmds/inspect.c index 1db59d2e..983141ba 100644 --- a/cmds/inspect.c +++ b/cmds/inspect.c @@ -25,7 +25,7 @@ #include "kerncompat.h" #include "ioctl.h" -#include "utils.h" +#include "common/utils.h" #include "ctree.h" #include "send-utils.h" #include "disk-io.h" diff --git a/cmds/property.c b/cmds/property.c index 7481aca2..67a277be 100644 --- a/cmds/property.c +++ b/cmds/property.c @@ -25,7 +25,7 @@ #include "cmds/commands.h" #include "props.h" #include "ctree.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static const char * const property_cmd_group_usage[] = { diff --git a/cmds/qgroup.c b/cmds/qgroup.c index bfd58f9e..2bd87964 100644 --- a/cmds/qgroup.c +++ b/cmds/qgroup.c @@ -27,7 +27,7 @@ #include "cmds/commands.h" #include "qgroup.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static const char * const qgroup_cmd_group_usage[] = { diff --git a/cmds/quota.c b/cmds/quota.c index f89a2cca..075fc798 100644 --- a/cmds/quota.c +++ b/cmds/quota.c @@ -23,7 +23,7 @@ #include "ioctl.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" static const char * const quota_cmd_group_usage[] = { diff --git a/cmds/receive.c b/cmds/receive.c index 19c58b20..97ce61e8 100644 --- a/cmds/receive.c +++ b/cmds/receive.c @@ -42,7 +42,7 @@ #include "ctree.h" #include "ioctl.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "list.h" #include "btrfs-list.h" diff --git a/cmds/replace.c b/cmds/replace.c index c46d3684..cd6cf21a 100644 --- a/cmds/replace.c +++ b/cmds/replace.c @@ -32,7 +32,7 @@ #include "kerncompat.h" #include "ctree.h" #include "ioctl.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "disk-io.h" diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c index 585c0133..1bc159b1 100644 --- a/cmds/rescue-chunk-recover.c +++ b/cmds/rescue-chunk-recover.c @@ -37,7 +37,7 @@ #include "volumes.h" #include "transaction.h" #include "crc32c.h" -#include "utils.h" +#include "common/utils.h" #include "btrfsck.h" #include "cmds/commands.h" #include "cmds/rescue.h" diff --git a/cmds/rescue-super-recover.c b/cmds/rescue-super-recover.c index c220a0f1..cc9c756c 100644 --- a/cmds/rescue-super-recover.c +++ b/cmds/rescue-super-recover.c @@ -30,7 +30,7 @@ #include "ctree.h" #include "disk-io.h" #include "list.h" -#include "utils.h" +#include "common/utils.h" #include "crc32c.h" #include "volumes.h" #include "cmds/commands.h" diff --git a/cmds/rescue.c b/cmds/rescue.c index 213ba77e..3dd5f73c 100644 --- a/cmds/rescue.c +++ b/cmds/rescue.c @@ -24,7 +24,7 @@ #include "transaction.h" #include "disk-io.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" #include "cmds/rescue.h" diff --git a/cmds/restore.c b/cmds/restore.c index b38f84fd..6cc6d439 100644 --- a/cmds/restore.c +++ b/cmds/restore.c @@ -43,7 +43,7 @@ #include "transaction.h" #include "list.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "cmds/commands.h" #include "common/help.h" diff --git a/cmds/scrub.c b/cmds/scrub.c index 13772241..cb839352 100644 --- a/cmds/scrub.c +++ b/cmds/scrub.c @@ -39,7 +39,7 @@ #include "ctree.h" #include "ioctl.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "disk-io.h" diff --git a/cmds/send.c b/cmds/send.c index 2a5c83ae..39ea6148 100644 --- a/cmds/send.c +++ b/cmds/send.c @@ -39,7 +39,7 @@ #include "ioctl.h" #include "cmds/commands.h" #include "list.h" -#include "utils.h" +#include "common/utils.h" #include "send.h" #include "send-utils.h" diff --git a/cmds/subvolume.c b/cmds/subvolume.c index 96827bf0..a2c69ce2 100644 --- a/cmds/subvolume.c +++ b/cmds/subvolume.c @@ -37,9 +37,8 @@ #include "ctree.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "btrfs-list.h" -#include "utils.h" #include "common/help.h" static int wait_for_subvolume_cleaning(int fd, size_t count, uint64_t *ids, diff --git a/common/fsfeatures.c b/common/fsfeatures.c index 43881370..50934bd1 100644 --- a/common/fsfeatures.c +++ b/common/fsfeatures.c @@ -19,7 +19,7 @@ #include #include "common/fsfeatures.h" #include "ctree.h" -#include "utils.h" +#include "common/utils.h" /* * Insert a root item for temporary tree root diff --git a/common/help.c b/common/help.c index 1ba40ec4..7b2ab3a1 100644 --- a/common/help.c +++ b/common/help.c @@ -21,7 +21,7 @@ #include #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "common/help.h" #define USAGE_SHORT 1U diff --git a/utils.c b/common/utils.c similarity index 99% rename from utils.c rename to common/utils.c index b0bfaa58..1c296740 100644 --- a/utils.c +++ b/common/utils.c @@ -48,7 +48,7 @@ #include "disk-io.h" #include "transaction.h" #include "crc32c.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "ioctl.h" #include "cmds/commands.h" diff --git a/utils.h b/common/utils.h similarity index 100% rename from utils.h rename to common/utils.h diff --git a/convert/common.c b/convert/common.c index 04b59019..a5bdfddd 100644 --- a/convert/common.c +++ b/convert/common.c @@ -18,7 +18,7 @@ #include #include "disk-io.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "mkfs/common.h" #include "convert/common.h" diff --git a/convert/main.c b/convert/main.c index 9041d8de..0cb0e325 100644 --- a/convert/main.c +++ b/convert/main.c @@ -95,7 +95,7 @@ #include "disk-io.h" #include "volumes.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "common/task-utils.h" #include "common/help.h" #include "mkfs/common.h" diff --git a/convert/source-ext2.c b/convert/source-ext2.c index 63cf71fe..f248249f 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -21,7 +21,7 @@ #include #include "disk-io.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "convert/common.h" #include "convert/source-ext2.h" diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c index cc592f19..5f46b9bb 100644 --- a/convert/source-reiserfs.c +++ b/convert/source-reiserfs.c @@ -24,7 +24,7 @@ #include #include "disk-io.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "bitops.h" #include "convert/common.h" #include "convert/source-reiserfs.h" diff --git a/disk-io.c b/disk-io.c index ffe4a8c5..dac15124 100644 --- a/disk-io.c +++ b/disk-io.c @@ -30,7 +30,7 @@ #include "volumes.h" #include "transaction.h" #include "crc32c.h" -#include "utils.h" +#include "common/utils.h" #include "print-tree.h" #include "rbtree-utils.h" diff --git a/extent-tree.c b/extent-tree.c index 451bb330..7706d024 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -30,7 +30,7 @@ #include "volumes.h" #include "free-space-cache.h" #include "free-space-tree.h" -#include "utils.h" +#include "common/utils.h" #define PENDING_EXTENT_INSERT 0 #define PENDING_EXTENT_DELETE 1 diff --git a/extent_io.c b/extent_io.c index 9f706fd4..dce1ce95 100644 --- a/extent_io.c +++ b/extent_io.c @@ -28,7 +28,7 @@ #include "list.h" #include "ctree.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "common/internal.h" void extent_io_tree_init(struct extent_io_tree *tree) diff --git a/file.c b/file.c index d9e78e4e..e2cf6030 100644 --- a/file.c +++ b/file.c @@ -18,7 +18,7 @@ #include #include "ctree.h" -#include "utils.h" +#include "common/utils.h" #include "disk-io.h" #include "transaction.h" #include "kerncompat.h" diff --git a/find-root.c b/find-root.c index 7e4c51f6..ea609920 100644 --- a/find-root.c +++ b/find-root.c @@ -21,7 +21,7 @@ #include #include #include "ctree.h" -#include "utils.h" +#include "common/utils.h" #include "find-root.h" #include "volumes.h" #include "disk-io.h" diff --git a/free-space-cache.c b/free-space-cache.c index 2ba2b659..fec9000d 100644 --- a/free-space-cache.c +++ b/free-space-cache.c @@ -25,7 +25,7 @@ #include "crc32c.h" #include "bitops.h" #include "common/internal.h" -#include "utils.h" +#include "common/utils.h" /* * Kernel always uses PAGE_CACHE_SIZE for sectorsize, but we don't have diff --git a/image/main.c b/image/main.c index cababa95..081f9466 100644 --- a/image/main.c +++ b/image/main.c @@ -32,7 +32,7 @@ #include "ctree.h" #include "disk-io.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "volumes.h" #include "extent_io.h" #include "common/help.h" diff --git a/image/sanitize.c b/image/sanitize.c index 1817fb72..9caa5dea 100644 --- a/image/sanitize.c +++ b/image/sanitize.c @@ -17,7 +17,7 @@ #include "kerncompat.h" #include "common/internal.h" #include "common/messages.h" -#include "utils.h" +#include "common/utils.h" #include "kernel-lib/crc32c.h" #include "image/sanitize.h" #include "extent_io.h" diff --git a/kernel-lib/raid56.c b/kernel-lib/raid56.c index cd5ee818..19beef43 100644 --- a/kernel-lib/raid56.c +++ b/kernel-lib/raid56.c @@ -27,7 +27,7 @@ #include "ctree.h" #include "disk-io.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "kernel-lib/raid56.h" /* diff --git a/mkfs/common.c b/mkfs/common.c index f7e3badc..a7242c49 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -22,7 +22,7 @@ #include "ctree.h" #include "disk-io.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "mkfs/common.h" static u64 reference_root_table[] = { diff --git a/mkfs/main.c b/mkfs/main.c index e008e446..0a1e26c5 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -36,7 +36,7 @@ #include "disk-io.h" #include "volumes.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "list_sort.h" #include "common/help.h" #include "rbtree-utils.h" diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c index bb8090eb..51411e02 100644 --- a/mkfs/rootdir.c +++ b/mkfs/rootdir.c @@ -31,7 +31,7 @@ #include "disk-io.h" #include "common/messages.h" #include "transaction.h" -#include "utils.h" +#include "common/utils.h" #include "mkfs/rootdir.h" #include "mkfs/common.h" #include "send-utils.h" diff --git a/print-tree.c b/print-tree.c index 1ca683a6..e3af1920 100644 --- a/print-tree.c +++ b/print-tree.c @@ -24,8 +24,7 @@ #include "ctree.h" #include "disk-io.h" #include "print-tree.h" -#include "utils.h" - +#include "common/utils.h" static void print_dir_item_type(struct extent_buffer *eb, struct btrfs_dir_item *di) diff --git a/props.c b/props.c index bf4f5a19..3a2dc5cf 100644 --- a/props.c +++ b/props.c @@ -25,7 +25,7 @@ #include "ctree.h" #include "cmds/commands.h" -#include "utils.h" +#include "common/utils.h" #include "props.h" #define XATTR_BTRFS_PREFIX "btrfs." diff --git a/qgroup-verify.c b/qgroup-verify.c index 3f2ce14a..0dc8e636 100644 --- a/qgroup-verify.c +++ b/qgroup-verify.c @@ -26,7 +26,7 @@ #include "ctree.h" #include "disk-io.h" #include "print-tree.h" -#include "utils.h" +#include "common/utils.h" #include "kernel-shared/ulist.h" #include "rbtree-utils.h" #include "transaction.h" diff --git a/qgroup.c b/qgroup.c index e5e90fb0..72441f1d 100644 --- a/qgroup.c +++ b/qgroup.c @@ -20,7 +20,7 @@ #include #include "ctree.h" #include "ioctl.h" -#include "utils.h" +#include "common/utils.h" #include #define BTRFS_QGROUP_NFILTERS_INCREASE (2 * BTRFS_QGROUP_FILTER_MAX) diff --git a/repair.c b/repair.c index 07a1232e..27e51ae3 100644 --- a/repair.c +++ b/repair.c @@ -18,7 +18,7 @@ #include "ctree.h" #include "extent-cache.h" -#include "utils.h" +#include "common/utils.h" #include "repair.h" int repair = 0; diff --git a/send-dump.c b/send-dump.c index 95e12400..2f1bab24 100644 --- a/send-dump.c +++ b/send-dump.c @@ -31,7 +31,7 @@ #include #include #include -#include "utils.h" +#include "common/utils.h" #include "cmds/commands.h" #include "send-utils.h" #include "send-stream.h" diff --git a/send-stream.c b/send-stream.c index a0ac5025..34c64c1f 100644 --- a/send-stream.c +++ b/send-stream.c @@ -22,7 +22,7 @@ #include "send.h" #include "send-stream.h" #include "crc32c.h" -#include "utils.h" +#include "common/utils.h" struct btrfs_send_stream { int fd; diff --git a/utils-lib.c b/utils-lib.c index 123f64a1..c2b6097f 100644 --- a/utils-lib.c +++ b/utils-lib.c @@ -1,13 +1,11 @@ #include "kerncompat.h" -#include "utils.h" +#include "common/utils.h" #include #include #include #include #include -#include "utils.h" - #if BTRFS_FLAT_INCLUDES #include "ctree.h" #else diff --git a/uuid-tree.c b/uuid-tree.c index 62c198b6..74228b46 100644 --- a/uuid-tree.c +++ b/uuid-tree.c @@ -23,7 +23,7 @@ #include "transaction.h" #include "disk-io.h" #include "print-tree.h" -#include "utils.h" +#include "common/utils.h" void btrfs_uuid_to_key(const u8 *uuid, struct btrfs_key *key) { diff --git a/volumes.c b/volumes.c index 79d1d6a0..0e6fb1db 100644 --- a/volumes.c +++ b/volumes.c @@ -27,7 +27,7 @@ #include "transaction.h" #include "print-tree.h" #include "volumes.h" -#include "utils.h" +#include "common/utils.h" #include "kernel-lib/raid56.h" const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {