btrfs-progs: cmds: update include lists

The tool IWYU (include what you use) suggests to remove and add some
includes.

Signed-off-by: David Sterba <dsterba@suse.com>

cmds/balance.c

@@ -16,8 +16,6 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25,11 +23,14 @@
 #include <getopt.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <dirent.h>
+#include <stdbool.h>
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/volumes.h"
 #include "common/open-utils.h"
 #include "common/utils.h"
 #include "common/parse-utils.h"
+#include "common/messages.h"
 #include "common/help.h"
 #include "cmds/commands.h"
 #include "ioctl.h"

cmds/device.c

@@ -16,7 +16,6 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
-#include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,8 +23,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <getopt.h>
+#include <dirent.h>
+#include <stdbool.h>
 #include "kernel-shared/ctree.h"
-#include "kernel-shared/volumes.h"
 #include "kernel-shared/zoned.h"
 #include "common/string-table.h"
 #include "common/utils.h"
@@ -37,6 +37,7 @@
 #include "common/open-utils.h"
 #include "common/units.h"
 #include "common/string-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 #include "cmds/filesystem-usage.h"
 #include "mkfs/common.h"

cmds/filesystem-du.c

@@ -15,26 +15,28 @@
  */
 
 #include "kerncompat.h"
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <linux/fs.h>
 #include <linux/version.h>
 #include <linux/fiemap.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <errno.h>
+#include <limits.h>
 #include "kernel-lib/rbtree.h"
+#include "kernel-lib/rbtree_types.h"
 #include "kernel-lib/interval_tree_generic.h"
+#include "kernel-shared/ctree.h"
 #include "common/utils.h"
 #include "common/open-utils.h"
 #include "common/units.h"
 #include "common/help.h"
+#include "common/messages.h"
 #include "common/fsfeatures.h"
 #include "cmds/commands.h"
 

cmds/filesystem-usage.c

@@ -16,16 +16,18 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
-#include <sys/vfs.h>
+#include <sys/statfs.h>
 #include <linux/limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <stdarg.h>
 #include <getopt.h>
 #include <fcntl.h>
+#include <dirent.h>
+#include <limits.h>
+#include "kernel-lib/sizes.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/volumes.h"
@@ -35,10 +37,9 @@
 #include "common/units.h"
 #include "common/help.h"
 #include "common/device-utils.h"
-#include "common/open-utils.h"
+#include "common/messages.h"
 #include "cmds/filesystem-usage.h"
 #include "cmds/commands.h"
-#include "version.h"
 
 /*
  * Add the chunk info to the chunk_info list

cmds/filesystem.c

@@ -16,24 +16,31 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <linux/version.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <ftw.h>
 #include <mntent.h>
 #include <getopt.h>
 #include <limits.h>
+#include <dirent.h>
+#include <stdbool.h>
 #include <uuid/uuid.h>
 #include "libbtrfsutil/btrfsutil.h"
+#include "kernel-lib/list.h"
+#include "kernel-lib/sizes.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-lib/list_sort.h"
 #include "kernel-shared/disk-io.h"
+#include "common/defs.h"
+#include "common/internal.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/units.h"
@@ -46,6 +53,7 @@
 #include "common/filesystem-utils.h"
 #include "cmds/commands.h"
 #include "cmds/filesystem-usage.h"
+#include "ioctl.h"
 
 /*
  * for btrfs fi show, we maintain a hash of fsids we've already printed.

cmds/inspect-dump-super.c

@@ -15,7 +15,6 @@
  */
 
 #include "kerncompat.h"
-#include <sys/stat.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -25,9 +24,9 @@
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "kernel-shared/zoned.h"
-#include "common/utils.h"
 #include "common/help.h"
 #include "common/string-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 
 static int load_and_dump_sb(char *filename, int fd, u64 sb_bytenr, int full,

cmds/inspect-dump-tree.c

@@ -22,13 +22,19 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <string.h>
+#include <strings.h>
 #include <uuid/uuid.h>
-#include "kernel-lib/radix-tree.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
-#include "kernel-shared/transaction.h"
 #include "kernel-shared/volumes.h"
+#include "kernel-shared/extent_io.h"
+#include "common/defs.h"
+#include "common/extent-cache.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/device-scan.h"

cmds/inspect-tree-stats.c

@@ -17,23 +17,20 @@
  */
 
 #include "kerncompat.h"
-#include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <zlib.h>
-#include "kernel-lib/list.h"
+#include <errno.h>
+#include <getopt.h>
+#include <string.h>
+#include "kernel-lib/rbtree.h"
+#include "kernel-lib/rbtree_types.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
-#include "kernel-shared/print-tree.h"
-#include "kernel-shared/transaction.h"
-#include "kernel-shared/volumes.h"
+#include "kernel-shared/extent_io.h"
 #include "common/utils.h"
 #include "common/help.h"
+#include "common/messages.h"
 #include "common/open-utils.h"
 #include "common/units.h"
 #include "cmds/commands.h"

cmds/inspect.c

@@ -18,13 +18,17 @@
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
 #include <errno.h>
 #include <getopt.h>
 #include <limits.h>
+#include <dirent.h>
+#include <string.h>
+#include "kernel-lib/list.h"
+#include "kernel-lib/sizes.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
+#include "common/internal.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/send-utils.h"
 #include "common/help.h"

cmds/property.c

@@ -14,6 +14,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include "kerncompat.h"
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
@@ -22,15 +23,22 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <dirent.h>
+#include <errno.h>
+#include <getopt.h>
+#include <stdbool.h>
 #include <uuid/uuid.h>
 #include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
+#include "common/defs.h"
+#include "common/messages.h"
 #include "common/open-utils.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/filesystem-utils.h"
 #include "cmds/commands.h"
 #include "cmds/props.h"
+#include "ioctl.h"
 
 #define XATTR_BTRFS_PREFIX     "btrfs."
 #define XATTR_BTRFS_PREFIX_LEN (sizeof(XATTR_BTRFS_PREFIX) - 1)

cmds/qgroup.c

@@ -17,16 +17,25 @@
  */
 
 #include <sys/ioctl.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
+#include <dirent.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 #include "libbtrfsutil/btrfsutil.h"
+#include "kernel-lib/list.h"
+#include "kernel-lib/rbtree.h"
+#include "kernel-lib/rbtree_types.h"
 #include "kernel-shared/ctree.h"
 #include "common/open-utils.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/units.h"
 #include "common/parse-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 #include "cmds/qgroup.h"
 #include "ioctl.h"

cmds/quota.c

@@ -17,11 +17,15 @@
  */
 
 #include <sys/ioctl.h>
-#include <unistd.h>
-#include "kernel-shared/ctree.h"
-#include "common/utils.h"
+#include <dirent.h>
+#include <errno.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
 #include "common/help.h"
 #include "common/open-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 #include "ioctl.h"
 

cmds/receive-dump.c

@@ -16,27 +16,19 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <math.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <mntent.h>
+#include "kerncompat.h"
 #include <limits.h>
-#include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
 #include <uuid/uuid.h>
-#include "common/utils.h"
-#include "common/send-utils.h"
+#include "common/defs.h"
+#include "common/messages.h"
 #include "common/send-stream.h"
 #include "common/path-utils.h"
-#include "cmds/commands.h"
 #include "cmds/receive-dump.h"
 
 #define PATH_CAT_OR_RET(function_name, outpath, path1, path2, ret)	\

cmds/receive-dump.h

@@ -20,6 +20,8 @@
 #define __BTRFS_SEND_DUMP_H__
 
 #include <linux/limits.h>
+#include <limits.h>
+#include "common/send-stream.h"
 
 struct btrfs_dump_send_args {
 	char full_subvol_path[PATH_MAX];

cmds/receive.c

@@ -17,26 +17,21 @@
  */
 
 #include "kerncompat.h"
-#include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
 #include <sys/xattr.h>
 #include <linux/fs.h>
 #include <unistd.h>
 #include <stdint.h>
-#include <dirent.h>
 #include <fcntl.h>
-#include <pthread.h>
-#include <math.h>
-#include <ftw.h>
-#include <assert.h>
 #include <getopt.h>
 #include <limits.h>
 #include <errno.h>
+#include <endian.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <uuid/uuid.h>
 #include <zlib.h>
 #if COMPRESSION_LZO
@@ -46,10 +41,9 @@
 #if COMPRESSION_ZSTD
 #include <zstd.h>
 #endif
-#include "libbtrfsutil/stubs.h"
 #include "kernel-shared/ctree.h"
-#include "kernel-lib/list.h"
-#include "kernel-shared/send.h"
+#include "common/defs.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/send-stream.h"
 #include "common/send-utils.h"

cmds/replace.c

@@ -18,8 +18,6 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,17 +26,18 @@
 #include <errno.h>
 #include <time.h>
 #include <assert.h>
-#include <inttypes.h>
 #include <getopt.h>
+#include <dirent.h>
+#include <signal.h>
+#include <stdbool.h>
 #include "kernel-shared/ctree.h"
-#include "kernel-shared/volumes.h"
-#include "kernel-shared/disk-io.h"
 #include "common/utils.h"
 #include "common/open-utils.h"
 #include "common/help.h"
 #include "common/path-utils.h"
 #include "common/device-utils.h"
 #include "common/string-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 #include "mkfs/common.h"
 #include "ioctl.h"

cmds/rescue-chunk-recover.c

@@ -17,27 +17,27 @@
  */
 
 #include "kerncompat.h"
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <stdio.h>
-#include <stdio_ext.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <uuid/uuid.h>
+#include <errno.h>
+#include <stddef.h>
+#include <string.h>
 #include "kernel-lib/list.h"
-#include "kernel-lib/radix-tree.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-shared/transaction.h"
-#include "crypto/crc32c.h"
+#include "kernel-shared/extent_io.h"
+#include "common/internal.h"
+#include "common/messages.h"
 #include "common/extent-cache.h"
 #include "common/utils.h"
-#include "cmds/commands.h"
 #include "cmds/rescue.h"
 #include "check/common.h"
+#include "ioctl.h"
 
 struct recover_control {
 	int verbose;

cmds/rescue-super-recover.c

@@ -17,22 +17,17 @@
  */
 
 #include "kerncompat.h"
-#include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <uuid/uuid.h>
+#include <string.h>
 #include "kernel-lib/list.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/volumes.h"
-#include "crypto/crc32c.h"
 #include "common/utils.h"
-#include "cmds/commands.h"
 #include "cmds/rescue.h"
 
 struct btrfs_recover_superblock {

cmds/rescue.c

@@ -17,12 +17,18 @@
  */
 
 #include "kerncompat.h"
+#include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <getopt.h>
+#include <errno.h>
+#include <stdio.h>
+#include "kernel-lib/list.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-shared/transaction.h"
 #include "kernel-shared/disk-io.h"
+#include "kernel-shared/extent_io.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/open-utils.h"

cmds/restore.c

@@ -20,14 +20,16 @@
 #include <sys/types.h>
 #include <sys/xattr.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <regex.h>
 #include <getopt.h>
+#include <errno.h>
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
 #if COMPRESSION_LZO
 #include <lzo/lzoconf.h>
 #include <lzo/lzo1x.h>
@@ -36,16 +38,16 @@
 #if COMPRESSION_ZSTD
 #include <zstd.h>
 #endif
-#include "kernel-lib/list.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
-#include "kernel-shared/transaction.h"
 #include "kernel-shared/volumes.h"
+#include "kernel-shared/extent_io.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/open-utils.h"
 #include "common/string-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 
 static char fs_name[PATH_MAX];

cmds/scrub.c

@@ -20,11 +20,10 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/syscall.h>
 #include <sys/file.h>
+#include <sys/time.h>
 #include <poll.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -33,10 +32,20 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <limits.h>
+#include <dirent.h>
+#include <errno.h>
+#include <getopt.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syscall.h>
+#include <time.h>
 #include <uuid/uuid.h>
-#include "kernel-shared/ctree.h"
+#include "kernel-lib/sizes.h"
 #include "kernel-shared/volumes.h"
-#include "kernel-shared/disk-io.h"
+#include "common/defs.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/open-utils.h"
 #include "common/units.h"

cmds/send.c

@@ -17,29 +17,23 @@
  */
 
 #include "kerncompat.h"
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <stdint.h>
-#include <dirent.h>
 #include <fcntl.h>
 #include <pthread.h>
-#include <math.h>
-#include <libgen.h>
-#include <mntent.h>
-#include <assert.h>
 #include <getopt.h>
 #include <limits.h>
-#include <uuid/uuid.h>
-#include "kernel-lib/list.h"
-#include "kernel-shared/ctree.h"
-#include "kernel-shared/send.h"
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "kernel-lib/sizes.h"
 #include "common/utils.h"
 #include "common/send-utils.h"
 #include "common/help.h"
 #include "common/path-utils.h"
 #include "common/string-utils.h"
+#include "common/messages.h"
 #include "cmds/commands.h"
 #include "ioctl.h"
 

cmds/subvolume-list.c

@@ -16,11 +16,18 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <time.h>
+#include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <uuid/uuid.h>
+#include "kernel-lib/rbtree.h"
+#include "kernel-lib/rbtree_types.h"
 #include "kernel-shared/ctree.h"
+#include "common/defs.h"
 #include "common/rbtree-utils.h"
 #include "common/help.h"
 #include "common/messages.h"

cmds/subvolume.c

@@ -16,8 +16,6 @@
 
 #include "kerncompat.h"
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vfs.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,12 +23,16 @@
 #include <unistd.h>
 #include <errno.h>
 #include <libgen.h>
-#include <limits.h>
 #include <getopt.h>
+#include <dirent.h>
+#include <stdbool.h>
+#include <time.h>
 #include <uuid/uuid.h>
 #include "libbtrfsutil/btrfsutil.h"
-#include "cmds/qgroup.h"
 #include "kernel-shared/ctree.h"
+#include "common/defs.h"
+#include "common/internal.h"
+#include "common/messages.h"
 #include "common/utils.h"
 #include "common/help.h"
 #include "common/path-utils.h"
@@ -39,6 +41,7 @@
 #include "common/string-utils.h"
 #include "common/units.h"
 #include "cmds/commands.h"
+#include "cmds/qgroup.h"
 #include "ioctl.h"
 
 static int wait_for_subvolume_cleaning(int fd, size_t count, uint64_t *ids,

common/messages.h

@@ -17,6 +17,11 @@
 #ifndef __BTRFS_MESSAGES_H__
 #define __BTRFS_MESSAGES_H__
 
+#include "kerncompat.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
 #ifdef DEBUG_VERBOSE_ERROR
 #define	PRINT_VERBOSE_ERROR	fprintf(stderr, "%s:%d:", __FILE__, __LINE__)
 #else