tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

btrfs: remove unused included headers

With help of neovim, LSP and clangd we can identify header files that
are not actually needed to be included in the .c files. This is focused
only on removal (with minor fixups), further cleanups are possible but
will require doing the header files properly with forward declarations,
minimized includes and include-what-you-use care.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

David Sterba 2b712e3b dc527961

+6 -65
+2 -1
fs/btrfs/accessors.c
··· 5 5 6 6 #include <asm/unaligned.h> 7 7 #include "messages.h" 8 - #include "ctree.h" 8 + #include "extent_io.h" 9 + #include "fs.h" 9 10 #include "accessors.h" 10 11 11 12 static bool check_setget_bounds(const struct extent_buffer *eb,
-1
fs/btrfs/acl.c
··· 12 12 #include <linux/sched/mm.h> 13 13 #include <linux/slab.h> 14 14 #include "ctree.h" 15 - #include "btrfs_inode.h" 16 15 #include "xattr.h" 17 16 #include "acl.h" 18 17
-1
fs/btrfs/async-thread.c
··· 11 11 #include <linux/freezer.h> 12 12 #include <trace/events/btrfs.h> 13 13 #include "async-thread.h" 14 - #include "ctree.h" 15 14 16 15 enum { 17 16 WORK_DONE_BIT,
-1
fs/btrfs/bio.c
··· 11 11 #include "raid56.h" 12 12 #include "async-thread.h" 13 13 #include "dev-replace.h" 14 - #include "rcu-string.h" 15 14 #include "zoned.h" 16 15 #include "file-item.h" 17 16 #include "raid-stripe-tree.h"
-1
fs/btrfs/block-rsv.c
··· 6 6 #include "space-info.h" 7 7 #include "transaction.h" 8 8 #include "block-group.h" 9 - #include "disk-io.h" 10 9 #include "fs.h" 11 10 #include "accessors.h" 12 11
+1 -4
fs/btrfs/compression.c
··· 25 25 #include "misc.h" 26 26 #include "ctree.h" 27 27 #include "fs.h" 28 - #include "disk-io.h" 29 - #include "transaction.h" 30 28 #include "btrfs_inode.h" 31 29 #include "bio.h" 32 30 #include "ordered-data.h" ··· 32 34 #include "extent_io.h" 33 35 #include "extent_map.h" 34 36 #include "subpage.h" 35 - #include "zoned.h" 36 - #include "file-item.h" 37 + #include "messages.h" 37 38 #include "super.h" 38 39 39 40 static struct bio_set btrfs_compressed_bioset;
-1
fs/btrfs/defrag.c
··· 6 6 #include <linux/sched.h> 7 7 #include "ctree.h" 8 8 #include "disk-io.h" 9 - #include "print-tree.h" 10 9 #include "transaction.h" 11 10 #include "locking.h" 12 11 #include "accessors.h"
-2
fs/btrfs/delalloc-space.c
··· 6 6 #include "block-rsv.h" 7 7 #include "btrfs_inode.h" 8 8 #include "space-info.h" 9 - #include "transaction.h" 10 9 #include "qgroup.h" 11 - #include "block-group.h" 12 10 #include "fs.h" 13 11 14 12 /*
-2
fs/btrfs/dev-replace.c
··· 11 11 #include <linux/math64.h> 12 12 #include "misc.h" 13 13 #include "ctree.h" 14 - #include "extent_map.h" 15 14 #include "disk-io.h" 16 15 #include "transaction.h" 17 - #include "print-tree.h" 18 16 #include "volumes.h" 19 17 #include "async-thread.h" 20 18 #include "dev-replace.h"
-1
fs/btrfs/disk-io.c
··· 29 29 #include "tree-log.h" 30 30 #include "free-space-cache.h" 31 31 #include "free-space-tree.h" 32 - #include "rcu-string.h" 33 32 #include "dev-replace.h" 34 33 #include "raid56.h" 35 34 #include "sysfs.h"
-1
fs/btrfs/export.c
··· 5 5 #include "ctree.h" 6 6 #include "disk-io.h" 7 7 #include "btrfs_inode.h" 8 - #include "print-tree.h" 9 8 #include "export.h" 10 9 #include "accessors.h" 11 10 #include "super.h"
-1
fs/btrfs/extent-io-tree.c
··· 6 6 #include "ctree.h" 7 7 #include "extent-io-tree.h" 8 8 #include "btrfs_inode.h" 9 - #include "misc.h" 10 9 11 10 static struct kmem_cache *extent_state_cache; 12 11
+1 -4
fs/btrfs/extent-tree.c
··· 18 18 #include <linux/crc32c.h> 19 19 #include "ctree.h" 20 20 #include "extent-tree.h" 21 - #include "tree-log.h" 21 + #include "transaction.h" 22 22 #include "disk-io.h" 23 23 #include "print-tree.h" 24 24 #include "volumes.h" ··· 26 26 #include "locking.h" 27 27 #include "free-space-cache.h" 28 28 #include "free-space-tree.h" 29 - #include "sysfs.h" 30 29 #include "qgroup.h" 31 30 #include "ref-verify.h" 32 31 #include "space-info.h" 33 32 #include "block-rsv.h" 34 - #include "delalloc-space.h" 35 33 #include "discard.h" 36 - #include "rcu-string.h" 37 34 #include "zoned.h" 38 35 #include "dev-replace.h" 39 36 #include "fs.h"
-2
fs/btrfs/extent_io.c
··· 14 14 #include <linux/pagevec.h> 15 15 #include <linux/prefetch.h> 16 16 #include <linux/fsverity.h> 17 - #include "misc.h" 18 17 #include "extent_io.h" 19 18 #include "extent-io-tree.h" 20 19 #include "extent_map.h" ··· 21 22 #include "btrfs_inode.h" 22 23 #include "bio.h" 23 24 #include "locking.h" 24 - #include "rcu-string.h" 25 25 #include "backref.h" 26 26 #include "disk-io.h" 27 27 #include "subpage.h"
-1
fs/btrfs/extent_map.c
··· 5 5 #include <linux/spinlock.h> 6 6 #include "messages.h" 7 7 #include "ctree.h" 8 - #include "volumes.h" 9 8 #include "extent_map.h" 10 9 #include "compression.h" 11 10 #include "btrfs_inode.h"
-3
fs/btrfs/file-item.c
··· 10 10 #include <linux/sched/mm.h> 11 11 #include <crypto/hash.h> 12 12 #include "messages.h" 13 - #include "misc.h" 14 13 #include "ctree.h" 15 14 #include "disk-io.h" 16 15 #include "transaction.h" 17 16 #include "bio.h" 18 - #include "print-tree.h" 19 17 #include "compression.h" 20 18 #include "fs.h" 21 19 #include "accessors.h" 22 20 #include "file-item.h" 23 - #include "super.h" 24 21 25 22 #define __MAX_CSUM_ITEMS(r, size) ((unsigned long)(((BTRFS_LEAF_DATA_SIZE(r) - \ 26 23 sizeof(struct btrfs_item) * 2) / \
+2
fs/btrfs/file-item.h
··· 5 5 6 6 #include "accessors.h" 7 7 8 + struct extent_map; 9 + 8 10 #define BTRFS_FILE_EXTENT_INLINE_DATA_START \ 9 11 (offsetof(struct btrfs_file_extent_item, disk_bytenr)) 10 12
-2
fs/btrfs/file.c
··· 22 22 #include "disk-io.h" 23 23 #include "transaction.h" 24 24 #include "btrfs_inode.h" 25 - #include "print-tree.h" 26 25 #include "tree-log.h" 27 26 #include "locking.h" 28 - #include "volumes.h" 29 27 #include "qgroup.h" 30 28 #include "compression.h" 31 29 #include "delalloc-space.h"
-2
fs/btrfs/free-space-cache.c
··· 19 19 #include "transaction.h" 20 20 #include "disk-io.h" 21 21 #include "extent_io.h" 22 - #include "volumes.h" 23 22 #include "space-info.h" 24 - #include "delalloc-space.h" 25 23 #include "block-group.h" 26 24 #include "discard.h" 27 25 #include "subpage.h"
-1
fs/btrfs/fs.h
··· 8 8 #include <linux/btrfs_tree.h> 9 9 #include <linux/sizes.h> 10 10 #include "extent-io-tree.h" 11 - #include "extent_map.h" 12 11 #include "async-thread.h" 13 12 #include "block-rsv.h" 14 13
-1
fs/btrfs/inode-item.c
··· 9 9 #include "inode-item.h" 10 10 #include "disk-io.h" 11 11 #include "transaction.h" 12 - #include "print-tree.h" 13 12 #include "space-info.h" 14 13 #include "accessors.h" 15 14 #include "extent-tree.h"
-2
fs/btrfs/inode.c
··· 39 39 #include "disk-io.h" 40 40 #include "transaction.h" 41 41 #include "btrfs_inode.h" 42 - #include "print-tree.h" 43 42 #include "ordered-data.h" 44 43 #include "xattr.h" 45 44 #include "tree-log.h" 46 45 #include "bio.h" 47 46 #include "compression.h" 48 47 #include "locking.h" 49 - #include "free-space-cache.h" 50 48 #include "props.h" 51 49 #include "qgroup.h" 52 50 #include "delalloc-space.h"
-4
fs/btrfs/ioctl.c
··· 34 34 #include "export.h" 35 35 #include "transaction.h" 36 36 #include "btrfs_inode.h" 37 - #include "print-tree.h" 38 37 #include "volumes.h" 39 38 #include "locking.h" 40 39 #include "backref.h" 41 - #include "rcu-string.h" 42 40 #include "send.h" 43 41 #include "dev-replace.h" 44 42 #include "props.h" ··· 45 47 #include "tree-log.h" 46 48 #include "compression.h" 47 49 #include "space-info.h" 48 - #include "delalloc-space.h" 49 50 #include "block-group.h" 50 - #include "subpage.h" 51 51 #include "fs.h" 52 52 #include "accessors.h" 53 53 #include "extent-tree.h"
-1
fs/btrfs/locking.c
··· 13 13 #include "ctree.h" 14 14 #include "extent_io.h" 15 15 #include "locking.h" 16 - #include "accessors.h" 17 16 18 17 /* 19 18 * Lockdep class keys for extent_buffer->lock's in this root. For a given
-2
fs/btrfs/messages.c
··· 3 3 #include "fs.h" 4 4 #include "messages.h" 5 5 #include "discard.h" 6 - #include "transaction.h" 7 - #include "space-info.h" 8 6 #include "super.h" 9 7 10 8 #ifdef CONFIG_PRINTK
-1
fs/btrfs/ordered-data.c
··· 19 19 #include "qgroup.h" 20 20 #include "subpage.h" 21 21 #include "file.h" 22 - #include "super.h" 23 22 24 23 static struct kmem_cache *btrfs_ordered_extent_cache; 25 24
-1
fs/btrfs/orphan.c
··· 4 4 */ 5 5 6 6 #include "ctree.h" 7 - #include "disk-io.h" 8 7 #include "orphan.h" 9 8 10 9 int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,
-1
fs/btrfs/raid-stripe-tree.c
··· 11 11 #include "disk-io.h" 12 12 #include "raid-stripe-tree.h" 13 13 #include "volumes.h" 14 - #include "misc.h" 15 14 #include "print-tree.h" 16 15 17 16 int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 length)
-1
fs/btrfs/raid56.c
··· 14 14 #include <linux/raid/xor.h> 15 15 #include <linux/mm.h> 16 16 #include "messages.h" 17 - #include "misc.h" 18 17 #include "ctree.h" 19 18 #include "disk-io.h" 20 19 #include "volumes.h"
-1
fs/btrfs/root-tree.c
··· 10 10 #include "messages.h" 11 11 #include "transaction.h" 12 12 #include "disk-io.h" 13 - #include "print-tree.h" 14 13 #include "qgroup.h" 15 14 #include "space-info.h" 16 15 #include "accessors.h"
-1
fs/btrfs/send.c
··· 25 25 #include "btrfs_inode.h" 26 26 #include "transaction.h" 27 27 #include "compression.h" 28 - #include "xattr.h" 29 28 #include "print-tree.h" 30 29 #include "accessors.h" 31 30 #include "dir-item.h"
-1
fs/btrfs/space-info.c
··· 9 9 #include "ordered-data.h" 10 10 #include "transaction.h" 11 11 #include "block-group.h" 12 - #include "zoned.h" 13 12 #include "fs.h" 14 13 #include "accessors.h" 15 14 #include "extent-tree.h"
-2
fs/btrfs/super.c
··· 34 34 #include "disk-io.h" 35 35 #include "transaction.h" 36 36 #include "btrfs_inode.h" 37 - #include "print-tree.h" 38 37 #include "props.h" 39 38 #include "xattr.h" 40 39 #include "bio.h" 41 40 #include "export.h" 42 41 #include "compression.h" 43 - #include "rcu-string.h" 44 42 #include "dev-replace.h" 45 43 #include "free-space-cache.h" 46 44 #include "backref.h"
-2
fs/btrfs/transaction.c
··· 23 23 #include "qgroup.h" 24 24 #include "block-group.h" 25 25 #include "space-info.h" 26 - #include "zoned.h" 27 26 #include "fs.h" 28 27 #include "accessors.h" 29 28 #include "extent-tree.h" 30 29 #include "root-tree.h" 31 - #include "defrag.h" 32 30 #include "dir-item.h" 33 31 #include "uuid-tree.h" 34 32 #include "ioctl.h"
-2
fs/btrfs/tree-checker.c
··· 21 21 #include "messages.h" 22 22 #include "ctree.h" 23 23 #include "tree-checker.h" 24 - #include "disk-io.h" 25 24 #include "compression.h" 26 25 #include "volumes.h" 27 26 #include "misc.h" ··· 29 30 #include "file-item.h" 30 31 #include "inode-item.h" 31 32 #include "dir-item.h" 32 - #include "raid-stripe-tree.h" 33 33 #include "extent-tree.h" 34 34 35 35 /*
-2
fs/btrfs/tree-log.c
··· 13 13 #include "tree-log.h" 14 14 #include "disk-io.h" 15 15 #include "locking.h" 16 - #include "print-tree.h" 17 16 #include "backref.h" 18 17 #include "compression.h" 19 18 #include "qgroup.h" 20 19 #include "block-group.h" 21 20 #include "space-info.h" 22 - #include "zoned.h" 23 21 #include "inode-item.h" 24 22 #include "fs.h" 25 23 #include "accessors.h"
-1
fs/btrfs/ulist.c
··· 7 7 #include <linux/slab.h> 8 8 #include "messages.h" 9 9 #include "ulist.h" 10 - #include "ctree.h" 11 10 12 11 /* 13 12 * ulist is a generic data structure to hold a collection of unique u64
-1
fs/btrfs/uuid-tree.c
··· 9 9 #include "ctree.h" 10 10 #include "transaction.h" 11 11 #include "disk-io.h" 12 - #include "print-tree.h" 13 12 #include "fs.h" 14 13 #include "accessors.h" 15 14 #include "uuid-tree.h"
-1
fs/btrfs/verity.c
··· 14 14 #include "ctree.h" 15 15 #include "btrfs_inode.h" 16 16 #include "transaction.h" 17 - #include "disk-io.h" 18 17 #include "locking.h" 19 18 #include "fs.h" 20 19 #include "accessors.h"
-2
fs/btrfs/volumes.c
··· 14 14 #include <linux/namei.h> 15 15 #include "misc.h" 16 16 #include "ctree.h" 17 - #include "extent_map.h" 18 17 #include "disk-io.h" 19 18 #include "transaction.h" 20 - #include "print-tree.h" 21 19 #include "volumes.h" 22 20 #include "raid56.h" 23 21 #include "rcu-string.h"
-2
fs/btrfs/zoned.c
··· 12 12 #include "rcu-string.h" 13 13 #include "disk-io.h" 14 14 #include "block-group.h" 15 - #include "transaction.h" 16 15 #include "dev-replace.h" 17 16 #include "space-info.h" 18 - #include "super.h" 19 17 #include "fs.h" 20 18 #include "accessors.h" 21 19 #include "bio.h"
-1
fs/btrfs/zstd.c
··· 19 19 #include <linux/zstd.h> 20 20 #include "misc.h" 21 21 #include "compression.h" 22 - #include "ctree.h" 23 22 24 23 #define ZSTD_BTRFS_MAX_WINDOWLOG 17 25 24 #define ZSTD_BTRFS_MAX_INPUT (1 << ZSTD_BTRFS_MAX_WINDOWLOG)