btrfs-progs: clean up includes

Remove unused includes, add ones that are missing. Signed-off-by: David Sterba <[email protected]>
kdave · Jan 16, 2025 · abad680 · abad680
1 parent 5af36f0
commit abad680
Show file tree

Hide file tree

Showing 71 changed files with 44 additions and 84 deletions.
diff --git a/check/mode-original.h b/check/mode-original.h
@@ -21,6 +21,11 @@
 #ifndef __BTRFS_CHECK_MODE_ORIGINAL_H__
 #define __BTRFS_CHECK_MODE_ORIGINAL_H__
 
+#include "kerncompat.h"
+#include "kernel-lib/rbtree.h"
+#include "kernel-lib/list.h"
+#include "kernel-shared/uapi/btrfs_tree.h"
+#include "common/extent-cache.h"
 #include "common/rbtree-utils.h"
 
 struct extent_backref {

diff --git a/cmds/device.c b/cmds/device.c
@@ -26,7 +26,6 @@
 #include <dirent.h>
 #include <stdbool.h>
 #include "kernel-shared/zoned.h"
-#include "kernel-shared/volumes.h"
 #include "common/string-table.h"
 #include "common/utils.h"
 #include "common/help.h"

diff --git a/cmds/filesystem-usage.h b/cmds/filesystem-usage.h
@@ -20,7 +20,7 @@
 #define __CMDS_FI_USAGE_H__
 
 #include "kerncompat.h"
-#include "kernel-shared/volumes.h"
+#include "kernel-shared/uapi/btrfs.h"
 #include "common/array.h"
 
 struct device_info {

diff --git a/cmds/props.h b/cmds/props.h
@@ -17,6 +17,8 @@
 #ifndef __BTRFS_PROPS_H__
 #define __BTRFS_PROPS_H__
 
+#include <stdbool.h>
+
 enum prop_object_type {
 	prop_object_dev		= (1U << 0),
 	prop_object_root	= (1U << 1),

diff --git a/cmds/reflink.c b/cmds/reflink.c
@@ -23,8 +23,6 @@
 #include <unistd.h>
 #include "kernel-lib/list.h"
 #include "common/messages.h"
-#include "common/open-utils.h"
-#include "common/parse-utils.h"
 #include "common/string-utils.h"
 #include "common/help.h"
 #include "cmds/commands.h"

diff --git a/cmds/scrub.c b/cmds/scrub.c
@@ -50,11 +50,9 @@
 #include "common/open-utils.h"
 #include "common/units.h"
 #include "common/device-utils.h"
-#include "common/parse-utils.h"
 #include "common/sysfs-utils.h"
 #include "common/string-table.h"
 #include "common/string-utils.h"
-#include "common/parse-utils.h"
 #include "common/help.h"
 #include "cmds/commands.h"
 

diff --git a/common/clear-cache.c b/common/clear-cache.c
@@ -31,9 +31,9 @@
 #include "kernel-shared/file-item.h"
 #include "common/internal.h"
 #include "common/messages.h"
+#include "common/clear-cache.h"
 #include "check/repair.h"
 #include "check/mode-common.h"
-#include "common/clear-cache.h"
 
 /*
  * Number of free space cache inodes to delete in one transaction.

diff --git a/common/device-scan.h b/common/device-scan.h
@@ -19,7 +19,6 @@
 
 #include "kerncompat.h"
 #include <dirent.h>
-#include "kernel-lib/bitops.h"
 #include "kernel-shared/uapi/btrfs.h"
 
 enum {

diff --git a/common/device-utils.h b/common/device-utils.h
@@ -20,7 +20,6 @@
 #include "kerncompat.h"
 #include <stdbool.h>
 #include <unistd.h>
-#include "kernel-lib/bitops.h"
 
 struct btrfs_ioctl_dev_info_args;
 struct stat;

diff --git a/common/extent-tree-utils.c b/common/extent-tree-utils.c
@@ -16,12 +16,8 @@
 
 #include "kerncompat.h"
 #include <stddef.h>
-#include "kernel-shared/accessors.h"
 #include "kernel-shared/uapi/btrfs_tree.h"
 #include "kernel-shared/ctree.h"
-#include "kernel-shared/disk-io.h"
-#include "kernel-shared/free-space-tree.h"
-#include "kernel-shared/transaction.h"
 #include "common/extent-tree-utils.h"
 
 /*

diff --git a/common/extent-tree-utils.h b/common/extent-tree-utils.h
@@ -18,8 +18,6 @@
 #define _EXTENT_TREE_UTILS_H_
 
 #include "kerncompat.h"
-#include "kernel-lib/bitops.h"
-#include "kernel-shared/compression.h"
 
 struct btrfs_inode_item;
 struct btrfs_path;

diff --git a/common/fsfeatures.h b/common/fsfeatures.h
@@ -20,6 +20,7 @@
 #include "kerncompat.h"
 #include <stdio.h>
 #include "kernel-lib/sizes.h"
+#include "kernel-shared/uapi/btrfs.h"
 
 #define BTRFS_MKFS_DEFAULT_NODE_SIZE SZ_16K
 

diff --git a/common/root-tree-utils.c b/common/root-tree-utils.c
@@ -14,12 +14,14 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include "kerncompat.h"
 #include <time.h>
 #include <uuid/uuid.h>
-#include "common/root-tree-utils.h"
-#include "common/messages.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/uuid-tree.h"
+#include "kernel-shared/transaction.h"
+#include "common/root-tree-utils.h"
+#include "common/messages.h"
 
 int btrfs_make_root_dir(struct btrfs_trans_handle *trans,
 			struct btrfs_root *root, u64 objectid)

diff --git a/common/root-tree-utils.h b/common/root-tree-utils.h
@@ -17,7 +17,11 @@
 #ifndef __ROOT_TREE_UTILS_H__
 #define __ROOT_TREE_UTILS_H__
 
-#include "kernel-shared/transaction.h"
+#include "kerncompat.h"
+
+struct btrfs_root;
+struct btrfs_fs_info;
+struct btrfs_trans_handle;
 
 int btrfs_make_root_dir(struct btrfs_trans_handle *trans,
 			struct btrfs_root *root, u64 objectid);

diff --git a/common/send-stream.c b/common/send-stream.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "kernel-shared/accessors.h"
 #include "kernel-shared/uapi/btrfs_tree.h"
 #include "kernel-shared/uapi/btrfs.h"
 #include "kernel-shared/send.h"

diff --git a/common/send-utils.h b/common/send-utils.h
@@ -21,6 +21,7 @@
 
 #include "kerncompat.h"
 #include <stddef.h>
+#include "kernel-shared/uapi/btrfs.h"
 
 enum subvol_search_type {
 	subvol_search_by_root_id,

diff --git a/common/sysfs-utils.h b/common/sysfs-utils.h
@@ -17,6 +17,7 @@
 #ifndef __COMMON_SYSFS_UTILS__
 #define __COMMON_SYSFS_UTILS__
 
+#include "kerncompat.h"
 #include <stddef.h>
 
 int sysfs_open_file(const char *name);

diff --git a/common/tree-search.h b/common/tree-search.h
@@ -1,7 +1,8 @@
 #ifndef __COMMON_TREE_SEARCH_H__
 #define __COMMON_TREE_SEARCH_H__
 
-#include "kernel-shared/uapi/btrfs_tree.h"
+#include "kerncompat.h"
+#include <stdbool.h>
 #include "kernel-shared/uapi/btrfs.h"
 
 #define BTRFS_TREE_SEARCH_V2_BUF_SIZE		65536

diff --git a/common/utils.h b/common/utils.h
@@ -25,7 +25,6 @@
 #include <sys/stat.h>
 #include "kernel-lib/list.h"
 #include "kernel-shared/volumes.h"
-#include "common/fsfeatures.h"
 
 struct list_head;
 

diff --git a/convert/common.c b/convert/common.c
@@ -30,7 +30,6 @@
 #include "kernel-shared/file-item.h"
 #include "kernel-shared/transaction.h"
 #include "kernel-shared/free-space-tree.h"
-#include "common/path-utils.h"
 #include "common/messages.h"
 #include "common/string-utils.h"
 #include "common/extent-tree-utils.h"

diff --git a/convert/main.c b/convert/main.c
@@ -111,7 +111,6 @@
 #include "common/cpu-utils.h"
 #include "common/messages.h"
 #include "common/task-utils.h"
-#include "common/path-utils.h"
 #include "common/help.h"
 #include "common/parse-utils.h"
 #include "common/string-utils.h"

diff --git a/crypto/blake2b-avx2.c b/crypto/blake2b-avx2.c
@@ -15,7 +15,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "blake2.h"

diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c
@@ -16,10 +16,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
-
 #include "blake2.h"
 #include "blake2-impl.h"
-
 #include "common/cpu-utils.h"
 
 static const uint64_t blake2b_IV[8] =

diff --git a/crypto/blake2b-sse2.c b/crypto/blake2b-sse2.c
@@ -14,8 +14,6 @@
 */
 
 #include <stdint.h>
-#include <string.h>
-
 #include "blake2.h"
 #include "blake2-impl.h"
 #include "blake2-config.h"

diff --git a/crypto/blake2b-sse41.c b/crypto/blake2b-sse41.c
@@ -14,9 +14,6 @@
 */
 
 #include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-
 #include "blake2.h"
 #include "blake2-impl.h"
 #include "blake2-config.h"

diff --git a/crypto/hash-speedtest.c b/crypto/hash-speedtest.c
@@ -26,9 +26,6 @@
 #define HAVE_PERF
 #endif
 #include "crypto/hash.h"
-#include "crypto/crc32c.h"
-#include "crypto/sha.h"
-#include "crypto/blake2.h"
 #include "common/messages.h"
 #include "common/cpu-utils.h"
 

diff --git a/crypto/hash-vectest.c b/crypto/hash-vectest.c
@@ -16,9 +16,6 @@
 
 #include "kerncompat.h"
 #include "crypto/hash.h"
-#include "crypto/crc32c.h"
-#include "crypto/sha.h"
-#include "crypto/blake2.h"
 #include "common/messages.h"
 #include "common/cpu-utils.h"
 

diff --git a/crypto/hash.c b/crypto/hash.c
@@ -14,6 +14,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include "kerncompat.h"
 #include "crypto/hash.h"
 #include "crypto/crc32c.h"
 #include "crypto/xxhash.h"

diff --git a/crypto/sha224-256.c b/crypto/sha224-256.c
@@ -42,7 +42,6 @@
 
 #include "crypto/sha.h"
 #include "crypto/sha-private.h"
-
 #include "common/cpu-utils.h"
 
 /* Define the SHA shift, rotate left, and rotate right macros */

diff --git a/image/metadump.h b/image/metadump.h
@@ -19,7 +19,6 @@
 
 #include "kerncompat.h"
 #include <pthread.h>
-#include "kernel-lib/rbtree.h"
 #include "kernel-lib/list.h"
 #include "kernel-lib/sizes.h"
 #include "kernel-shared/ctree.h"

diff --git a/kernel-lib/bitmap.h b/kernel-lib/bitmap.h
@@ -10,8 +10,8 @@
 #ifndef _BTRFS_PROGS_LINUX_BITMAP_H_
 #define _BTRFS_PROGS_LINUX_BITMAP_H_
 
-#include <stdlib.h>
 #include "kerncompat.h"
+#include <stdlib.h>
 #include "kernel-lib/bitops.h"
 
 static inline unsigned long *bitmap_zalloc(unsigned int nbits)

diff --git a/kernel-lib/mktables.c b/kernel-lib/mktables.c
@@ -22,10 +22,7 @@
  */
 
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
-#include <stdlib.h>
-#include <time.h>
 
 static uint8_t gfmul(uint8_t a, uint8_t b)
 {

diff --git a/kernel-lib/overflow.h b/kernel-lib/overflow.h
@@ -3,6 +3,8 @@
 #define __LINUX_OVERFLOW_H
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /*
  * We need to compute the minimum and maximum values representable in a given

diff --git a/kernel-lib/raid56.c b/kernel-lib/raid56.c
@@ -21,11 +21,11 @@
  *
  * This file was postprocessed using unroll.pl and then ported to userspace
  */
+#include "kerncompat.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include "kerncompat.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-shared/uapi/btrfs_tree.h"
 #include "kernel-lib/raid56.h"

diff --git a/kernel-lib/raid56.h b/kernel-lib/raid56.h
@@ -24,7 +24,6 @@
 
 #include "kerncompat.h"
 #include <stddef.h>
-#include "kernel-lib/bitops.h"
 
 void raid6_gen_syndrome(int disks, size_t bytes, void **ptrs);
 int raid5_gen_result(int nr_devs, size_t stripe_len, int dest, void **data);

diff --git a/kernel-lib/trace.h b/kernel-lib/trace.h
@@ -1,6 +1,8 @@
 #ifndef __PROGS_TRACE_H__
 #define __PROGS_TRACE_H__
 
+#include "kerncompat.h"
+
 struct btrfs_work;
 struct btrfs_fs_info;
 struct extent_state;

diff --git a/kernel-shared/accessors.h b/kernel-shared/accessors.h
@@ -6,7 +6,6 @@
 #include "kerncompat.h"
 #include <stddef.h>
 #include <string.h>
-#include "kernel-lib/bitops.h"
 #include "kernel-shared/extent_io.h"
 #include "kernel-shared/uapi/btrfs.h"
 #include "kernel-shared/uapi/btrfs_tree.h"

diff --git a/kernel-shared/async-thread.h b/kernel-shared/async-thread.h
@@ -10,7 +10,6 @@
 #include "kerncompat.h"
 #include <stdbool.h>
 #include "kernel-lib/list.h"
-#include "kernel-lib/bitops.h"
 
 struct btrfs_fs_info;
 struct btrfs_workqueue;

diff --git a/kernel-shared/backref.c b/kernel-shared/backref.c
@@ -20,7 +20,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <errno.h>
 #include "kernel-lib/list.h"
 #include "kernel-shared/accessors.h"
 #include "kernel-shared/extent_io.h"

diff --git a/kernel-shared/backref.h b/kernel-shared/backref.h
@@ -20,7 +20,6 @@
 #define __BTRFS_BACKREF_H__
 
 #include "kerncompat.h"
-#include "kernel-lib/bitops.h"
 
 struct btrfs_extent_item;
 struct btrfs_fs_info;

diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h
@@ -23,7 +23,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "kernel-lib/list.h"
-#include "kernel-lib/bitops.h"
 #include "kernel-lib/rbtree_types.h"
 #include "kernel-shared/uapi/btrfs.h"
 #include "kernel-shared/uapi/btrfs_tree.h"

diff --git a/kernel-shared/delayed-ref.h b/kernel-shared/delayed-ref.h
@@ -24,7 +24,6 @@
 #include <stdbool.h>
 #include "kernel-lib/list.h"
 #include "kernel-lib/rbtree_types.h"
-#include "kernel-lib/bitops.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/uapi/btrfs_tree.h"