c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: convert: update include lists

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

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-09-15 13:53:43 +02:00
parent 6d9b3835a6
commit ec55de0ac5
9 changed files with 62 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
convert/common.c
View file

@ -14,14 +14,22 @@
* Boston, MA 021110-1307, USA.
*/
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <uuid/uuid.h>
#include "kernel-lib/sizes.h"
#include "kernel-shared/ctree.h"
#include "kernel-shared/extent_io.h"
#include "kernel-shared/disk-io.h"
#include "kernel-shared/volumes.h"
#include "common/utils.h"
#include "common/path-utils.h"
#include "common/messages.h"
#include "mkfs/common.h"
#include "convert/common.h"
#include "ioctl.h"
#define BTRFS_CONVERT_META_GROUP_SIZE SZ_32M

5
convert/common.h
View file

@ -23,13 +23,12 @@
#define __BTRFS_CONVERT_COMMON_H__
#include "kerncompat.h"
#include "common/defs.h"
#include "common/extent-cache.h"
#define SOURCE_FS_UUID_SIZE (16)
struct btrfs_mkfs_config;
#define SOURCE_FS_UUID_SIZE (16)
struct btrfs_convert_context {
u32 blocksize;
u64 first_data_block;

12
convert/main.c
View file

@ -81,7 +81,7 @@
*/
#include "kerncompat.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
@ -89,13 +89,21 @@
#include <getopt.h>
#include <pthread.h>
#include <stdbool.h>
#include <errno.h>
#include <limits.h>
#include <string.h>
#include <uuid/uuid.h>
#include "kernel-lib/sizes.h"
#include "kernel-shared/extent_io.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 "common/utils.h"
#include "common/defs.h"
#include "common/extent-cache.h"
#include "common/internal.h"
#include "common/messages.h"
#include "common/task-utils.h"
#include "common/path-utils.h"
#include "common/help.h"

12
convert/source-ext2.c
View file

@ -17,12 +17,20 @@
#if BTRFSCONVERT_EXT2
#include "kerncompat.h"
#include <sys/stat.h>
#include <linux/limits.h>
#include <errno.h>
#include <pthread.h>
#include "kernel-shared/disk-io.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "kernel-lib/sizes.h"
#include "kernel-shared/transaction.h"
#include "common/utils.h"
#include "common/extent-cache.h"
#include "common/messages.h"
#include "convert/common.h"
#include "convert/source-fs.h"
#include "convert/source-ext2.h"
/*

5
convert/source-ext2.h
View file

@ -22,9 +22,12 @@
#include "kerncompat.h"
#include <ext2fs/ext2_fs.h>
#include <ext2fs/ext2fs.h>
#include <ext2fs/ext2_ext_attr.h>
#include "convert/source-fs.h"
struct btrfs_inode_item;
struct btrfs_root;
struct btrfs_trans_handle;
#define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO)
/*

4
convert/source-fs.c
View file

@ -15,10 +15,14 @@
*/
#include "kerncompat.h"
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include "kernel-lib/sizes.h"
#include "kernel-shared/disk-io.h"
#include "kernel-shared/volumes.h"
#include "common/internal.h"
#include "common/extent-cache.h"
#include "convert/common.h"
#include "convert/source-fs.h"

14
convert/source-fs.h
View file

@ -21,6 +21,12 @@
#include <sys/types.h>
#include <pthread.h>
struct btrfs_convert_context;
struct btrfs_inode_item;
struct btrfs_root;
struct btrfs_trans_handle;
struct task_info;
#define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
/*
@ -36,8 +42,6 @@ struct simple_range {
extern const struct simple_range btrfs_reserved_ranges[3];
struct task_info;
struct task_ctx {
pthread_mutex_t mutex;
u64 max_copy_inodes;
@ -45,8 +49,6 @@ struct task_ctx {
struct task_info *info;
};
struct btrfs_convert_context;
#define SOURCE_FS_NAME_LEN (16)
#define CONVERT_FLAG_DATACSUM (1U << 0)
@ -123,10 +125,6 @@ struct btrfs_convert_operations {
int (*check_state)(struct btrfs_convert_context *cctx);
};
struct btrfs_trans_handle;
struct btrfs_root;
struct btrfs_inode_item;
struct blk_iterate_data {
struct btrfs_trans_handle *trans;
struct btrfs_root *root;

13
convert/source-reiserfs.c
View file

@ -17,14 +17,23 @@
#if BTRFSCONVERT_REISERFS
#include "kerncompat.h"
#include <linux/fs.h>
#include <sys/stat.h>
#include <linux/fs.h>
#include <stdbool.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <limits.h>
#include <reiserfs/reiserfs_lib.h>
#include "kernel-lib/bitops.h"
#include "kernel-shared/disk-io.h"
#include "kernel-shared/transaction.h"
#include "common/utils.h"
#include "kernel-shared/extent_io.h"
#include "common/extent-cache.h"
#include "common/internal.h"
#include "common/messages.h"
#include "convert/common.h"
#include "convert/source-reiserfs.h"

6
convert/source-reiserfs.h
View file

@ -20,12 +20,18 @@
#if BTRFSCONVERT_REISERFS
#include "kerncompat.h"
#include <stdbool.h>
#include <stddef.h>
#include <reiserfs/misc.h>
#include <reiserfs/io.h>
#include <reiserfs/reiserfs_lib.h>
#include <reiserfs/reiserfs_fs.h>
#include "convert/source-fs.h"
struct btrfs_inode_item;
struct btrfs_root;
struct btrfs_trans_handle;
#define REISERFS_ACL_VERSION 0x0001
#define OID_OFFSET (BTRFS_FIRST_FREE_OBJECTID - REISERFS_ROOT_OBJECTID)