Skip to content

Commit 21aa677

Browse files
kdavekdave
committed
btrfs-progs: clean up includes, using include-what-you-use
Signed-off-by: David Sterba <[email protected]>
1 parent d4cf2a3 commit 21aa677

File tree

134 files changed

+590
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+590
-181
lines changed

‎btrfs-corrupt-block.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
#include <limits.h>
2424
#include <errno.h>
2525
#include <string.h>
26+
#include <unistd.h>
27+
#include "kernel-shared/accessors.h"
28+
#include "kernel-shared/uapi/btrfs_tree.h"
2629
#include "kernel-shared/ctree.h"
2730
#include "kernel-shared/volumes.h"
2831
#include "kernel-shared/disk-io.h"

‎btrfs-find-root.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
#include <stdlib.h>
2222
#include <getopt.h>
2323
#include <errno.h>
24+
#include <unistd.h>
25+
#include "kernel-shared/accessors.h"
26+
#include "kernel-shared/uapi/btrfs_tree.h"
2427
#include "kernel-shared/ctree.h"
2528
#include "kernel-shared/disk-io.h"
2629
#include "kernel-shared/volumes.h"
2730
#include "kernel-shared/extent_io.h"
2831
#include "kernel-shared/tree-checker.h"
2932
#include "common/box.h"
30-
#include "common/utils.h"
3133
#include "common/extent-cache.h"
3234
#include "common/help.h"
3335
#include "common/messages.h"

‎btrfs-map-logical.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525
#include <errno.h>
2626
#include <string.h>
2727
#include "kernel-lib/sizes.h"
28+
#include "kernel-shared/accessors.h"
29+
#include "kernel-shared/uapi/btrfs_tree.h"
2830
#include "kernel-shared/ctree.h"
2931
#include "kernel-shared/extent_io.h"
3032
#include "kernel-shared/volumes.h"
3133
#include "kernel-shared/disk-io.h"
3234
#include "common/internal.h"
33-
#include "common/utils.h"
35+
#include "common/messages.h"
3436
#include "common/help.h"
3537
#include "common/extent-cache.h"
3638
#include "common/extent-tree-utils.h"

‎btrfs-select-super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
#include <stdlib.h>
2222
#include <errno.h>
2323
#include <getopt.h>
24+
#include <unistd.h>
2425
#include "kernel-shared/ctree.h"
2526
#include "kernel-shared/volumes.h"
2627
#include "kernel-shared/disk-io.h"
27-
#include "common/utils.h"
2828
#include "common/help.h"
2929
#include "common/open-utils.h"
3030
#include "common/messages.h"

‎btrfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616

1717
#include "kerncompat.h"
18+
#include <unistd.h>
1819
#include <stdio.h>
1920
#include <stdlib.h>
2021
#include <string.h>

‎check/clear-cache.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
*/
1616

1717
#include "kerncompat.h"
18+
#include <errno.h>
19+
#include <stdio.h>
20+
#include <stdlib.h>
21+
#include "kernel-lib/rbtree.h"
22+
#include "kernel-shared/accessors.h"
23+
#include "kernel-shared/extent-io-tree.h"
24+
#include "kernel-shared/uapi/btrfs_tree.h"
1825
#include "kernel-shared/disk-io.h"
1926
#include "kernel-shared/ctree.h"
2027
#include "kernel-shared/free-space-cache.h"
@@ -24,7 +31,6 @@
2431
#include "kernel-shared/file-item.h"
2532
#include "common/internal.h"
2633
#include "common/messages.h"
27-
#include "check/common.h"
2834
#include "check/repair.h"
2935
#include "check/mode-common.h"
3036
#include "check/clear-cache.h"

‎check/main.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,22 @@
2727
#include <stddef.h>
2828
#include <string.h>
2929
#include <time.h>
30+
#include <unistd.h>
3031
#include <uuid/uuid.h>
3132
#include "kernel-lib/list.h"
3233
#include "kernel-lib/rbtree.h"
3334
#include "kernel-lib/rbtree_types.h"
3435
#include "kernel-lib/bitops.h"
35-
#include "kernel-shared/uapi/btrfs.h"
36+
#include "kernel-shared/accessors.h"
37+
#include "kernel-shared/extent-io-tree.h"
38+
#include "kernel-shared/locking.h"
39+
#include "kernel-shared/uapi/btrfs_tree.h"
3640
#include "kernel-shared/extent_io.h"
3741
#include "kernel-shared/ctree.h"
3842
#include "kernel-shared/volumes.h"
3943
#include "kernel-shared/disk-io.h"
4044
#include "kernel-shared/print-tree.h"
4145
#include "kernel-shared/transaction.h"
42-
#include "kernel-shared/free-space-cache.h"
43-
#include "kernel-shared/free-space-tree.h"
4446
#include "kernel-shared/backref.h"
4547
#include "kernel-shared/ulist.h"
4648
#include "kernel-shared/file-item.h"

‎check/mode-common.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include <string.h>
2222
#include <time.h>
2323
#include "kernel-lib/rbtree.h"
24+
#include "kernel-shared/accessors.h"
25+
#include "kernel-shared/extent-io-tree.h"
2426
#include "kernel-shared/extent_io.h"
2527
#include "kernel-shared/ctree.h"
2628
#include "kernel-shared/transaction.h"

‎check/mode-common.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
#include <sys/stat.h>
2626
#include <stdbool.h>
2727
#include "kernel-lib/list.h"
28+
#include "kernel-shared/uapi/btrfs_tree.h"
2829
#include "kernel-shared/ctree.h"
2930
#include "common/messages.h"
3031

3132
struct btrfs_trans_handle;
3233
struct extent_buffer;
34+
struct task_ctx;
3335

3436
extern struct task_ctx g_task_ctx;
3537

‎check/mode-lowmem.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
#include <stdbool.h>
2121
#include <stdio.h>
2222
#include <string.h>
23-
#include <time.h>
2423
#include "kernel-lib/rbtree.h"
24+
#include "kernel-shared/accessors.h"
25+
#include "kernel-shared/extent-io-tree.h"
26+
#include "kernel-shared/uapi/btrfs_tree.h"
2527
#include "kernel-shared/extent_io.h"
2628
#include "kernel-shared/ulist.h"
2729
#include "kernel-shared/ctree.h"

‎check/qgroup-verify.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "kernel-lib/list.h"
2626
#include "kernel-lib/rbtree.h"
2727
#include "kernel-lib/rbtree_types.h"
28+
#include "kernel-shared/accessors.h"
29+
#include "kernel-shared/uapi/btrfs_tree.h"
2830
#include "kernel-shared/ctree.h"
2931
#include "kernel-shared/disk-io.h"
3032
#include "kernel-shared/ulist.h"
@@ -46,7 +48,6 @@ void qgroup_set_item_count_ptr(u64 *item_count_ptr)
4648
/*#define QGROUP_VERIFY_DEBUG*/
4749
static unsigned long tot_extents_scanned = 0;
4850

49-
struct qgroup_count;
5051
static struct qgroup_count *find_count(u64 qgroupid);
5152

5253
struct qgroup_info {

‎check/repair.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
* Boston, MA 021110-1307, USA.
1717
*/
1818

19+
#include "kerncompat.h"
1920
#include <errno.h>
2021
#include <stdbool.h>
2122
#include <stdio.h>
2223
#include <stdlib.h>
2324
#include <string.h>
2425
#include "kernel-lib/list.h"
2526
#include "kernel-lib/rbtree.h"
27+
#include "kernel-shared/accessors.h"
28+
#include "kernel-shared/extent-io-tree.h"
2629
#include "kernel-shared/ctree.h"
2730
#include "kernel-shared/transaction.h"
2831
#include "kernel-shared/extent_io.h"

‎check/repair.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@
2020
#define __BTRFS_REPAIR_H__
2121

2222
#include "kerncompat.h"
23-
#include "kernel-shared/ctree.h"
23+
#include "kernel-shared/tree-checker.h"
24+
#include "kernel-shared/uapi/btrfs_tree.h"
2425
#include "common/extent-cache.h"
2526

2627
struct btrfs_trans_handle;
28+
struct btrfs_fs_info;
29+
struct btrfs_path;
30+
struct btrfs_root;
2731
struct extent_io_tree;
32+
struct extent_buffer;
2833

2934
/* Repair mode */
3035
extern int opt_check_repair;

‎cmds/balance.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
#include <errno.h>
2626
#include <dirent.h>
2727
#include <stdbool.h>
28-
#include "kernel-shared/uapi/btrfs.h"
29-
#include "kernel-shared/ctree.h"
28+
#include "kernel-shared/uapi/btrfs_tree.h"
3029
#include "kernel-shared/volumes.h"
3130
#include "common/open-utils.h"
3231
#include "common/utils.h"

‎cmds/device.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
#include <getopt.h>
2626
#include <dirent.h>
2727
#include <stdbool.h>
28-
#include "kernel-shared/uapi/btrfs.h"
29-
#include "kernel-shared/ctree.h"
3028
#include "kernel-shared/zoned.h"
29+
#include "kernel-shared/volumes.h"
3130
#include "common/string-table.h"
3231
#include "common/utils.h"
3332
#include "common/help.h"

‎cmds/filesystem-du.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@
2828
#include <dirent.h>
2929
#include <errno.h>
3030
#include <limits.h>
31+
#include <stdbool.h>
32+
#include <unistd.h>
3133
#include "kernel-lib/rbtree.h"
3234
#include "kernel-lib/rbtree_types.h"
3335
#include "kernel-lib/interval_tree_generic.h"
34-
#include "kernel-shared/ctree.h"
36+
#include "kernel-shared/uapi/btrfs_tree.h"
3537
#include "common/utils.h"
3638
#include "common/open-utils.h"
3739
#include "common/units.h"

‎cmds/filesystem-usage.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
#include <sys/ioctl.h>
1919
#include <sys/statfs.h>
2020
#include <linux/limits.h>
21+
#include <stdbool.h>
2122
#include <stdio.h>
2223
#include <stdlib.h>
2324
#include <string.h>
2425
#include <unistd.h>
2526
#include <errno.h>
26-
#include <getopt.h>
2727
#include <fcntl.h>
2828
#include <dirent.h>
2929
#include <limits.h>
@@ -32,6 +32,9 @@
3232
#include "kernel-shared/ctree.h"
3333
#include "kernel-shared/disk-io.h"
3434
#include "kernel-shared/volumes.h"
35+
#include "kernel-shared/accessors.h"
36+
#include "kernel-shared/uapi/btrfs_tree.h"
37+
#include "common/defs.h"
3538
#include "common/utils.h"
3639
#include "common/string-table.h"
3740
#include "common/open-utils.h"

‎cmds/filesystem-usage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define __CMDS_FI_USAGE_H__
2121

2222
#include "kerncompat.h"
23-
#include "kernel-shared/uapi/btrfs.h"
23+
#include "kernel-shared/volumes.h"
2424

2525
struct device_info {
2626
u64 devid;

‎cmds/filesystem.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "kernel-lib/list.h"
3737
#include "kernel-lib/sizes.h"
3838
#include "kernel-lib/list_sort.h"
39-
#include "kernel-shared/uapi/btrfs.h"
4039
#include "kernel-shared/ctree.h"
4140
#include "kernel-shared/compression.h"
4241
#include "kernel-shared/volumes.h"
@@ -53,7 +52,6 @@
5352
#include "common/device-utils.h"
5453
#include "common/open-utils.h"
5554
#include "common/parse-utils.h"
56-
#include "common/string-utils.h"
5755
#include "common/filesystem-utils.h"
5856
#include "common/format-output.h"
5957
#include "cmds/commands.h"

‎cmds/inspect-dump-super.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
*/
1616

1717
#include "kerncompat.h"
18+
#include <sys/stat.h>
19+
#include <linux/fs.h>
20+
#include <stdbool.h>
1821
#include <stdio.h>
1922
#include <unistd.h>
2023
#include <fcntl.h>
2124
#include <errno.h>
2225
#include <getopt.h>
23-
#include <sys/stat.h>
26+
#include "kernel-shared/accessors.h"
27+
#include "kernel-shared/uapi/btrfs_tree.h"
2428
#include "kernel-shared/ctree.h"
2529
#include "kernel-shared/disk-io.h"
2630
#include "kernel-shared/print-tree.h"

‎cmds/inspect-dump-tree.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,25 @@
1717
*/
1818

1919
#include "kerncompat.h"
20-
#include <stdio.h>
2120
#include <stdlib.h>
2221
#include <unistd.h>
2322
#include <getopt.h>
24-
#include <fcntl.h>
2523
#include <errno.h>
2624
#include <stdbool.h>
2725
#include <string.h>
2826
#include <strings.h>
2927
#include <uuid/uuid.h>
28+
#include "kernel-shared/accessors.h"
29+
#include "kernel-shared/uapi/btrfs.h"
30+
#include "kernel-shared/uapi/btrfs_tree.h"
3031
#include "kernel-shared/ctree.h"
3132
#include "kernel-shared/disk-io.h"
3233
#include "kernel-shared/print-tree.h"
33-
#include "kernel-shared/volumes.h"
3434
#include "kernel-shared/extent_io.h"
3535
#include "kernel-shared/tree-checker.h"
3636
#include "common/defs.h"
3737
#include "common/extent-cache.h"
3838
#include "common/messages.h"
39-
#include "common/utils.h"
4039
#include "common/help.h"
4140
#include "common/device-scan.h"
4241
#include "common/string-utils.h"

‎cmds/inspect-tree-stats.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818

1919
#include "kerncompat.h"
2020
#include <sys/time.h>
21-
#include <stdio.h>
2221
#include <stdlib.h>
2322
#include <errno.h>
24-
#include <getopt.h>
2523
#include <string.h>
24+
#include <stdbool.h>
25+
#include <unistd.h>
2626
#include "kernel-lib/rbtree.h"
2727
#include "kernel-lib/rbtree_types.h"
28+
#include "kernel-shared/accessors.h"
29+
#include "kernel-shared/uapi/btrfs_tree.h"
2830
#include "kernel-shared/ctree.h"
2931
#include "kernel-shared/disk-io.h"
3032
#include "kernel-shared/extent_io.h"
3133
#include "kernel-shared/file-item.h"
3234
#include "kernel-shared/tree-checker.h"
33-
#include "common/utils.h"
3435
#include "common/help.h"
3536
#include "common/messages.h"
3637
#include "common/open-utils.h"

‎cmds/inspect.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <sys/statfs.h>
2121
#include <linux/fs.h>
2222
#include <linux/magic.h>
23+
#include <stdbool.h>
2324
#include <fcntl.h>
2425
#include <stdio.h>
2526
#include <stdlib.h>
@@ -31,6 +32,8 @@
3132
#include <unistd.h>
3233
#include "kernel-lib/list.h"
3334
#include "kernel-lib/sizes.h"
35+
#include "kernel-shared/accessors.h"
36+
#include "kernel-shared/uapi/btrfs_tree.h"
3437
#include "kernel-shared/uapi/btrfs.h"
3538
#include "kernel-shared/ctree.h"
3639
#include "kernel-shared/disk-io.h"

‎cmds/property.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@
2020
#include <sys/xattr.h>
2121
#include <stdlib.h>
2222
#include <string.h>
23-
#include <stdio.h>
2423
#include <unistd.h>
2524
#include <fcntl.h>
2625
#include <dirent.h>
2726
#include <errno.h>
28-
#include <getopt.h>
2927
#include <stdbool.h>
3028
#include <uuid/uuid.h>
3129
#include "libbtrfsutil/btrfsutil.h"
3230
#include "kernel-shared/uapi/btrfs.h"
33-
#include "kernel-shared/ctree.h"
31+
#include "kernel-shared/uapi/btrfs_tree.h"
3432
#include "common/defs.h"
3533
#include "common/messages.h"
3634
#include "common/open-utils.h"

0 commit comments

Comments
 (0)