From ba06b3c50b4b275b66822dac8a894cd5ec508944 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:52 -0600 Subject: common: Drop uuid.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- fs/btrfs/btrfs.c | 1 + fs/ext4/ext4fs.c | 1 + 2 files changed, 2 insertions(+) (limited to 'fs') diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index cb7e182742..2e3985e385 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -8,6 +8,7 @@ #include "btrfs.h" #include #include +#include #include struct btrfs_info btrfs_info; diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 966b427a97..96ca276839 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -26,6 +26,7 @@ #include "ext4_common.h" #include #include +#include int ext4fs_symlinknest; struct ext_filesystem ext_fs; -- cgit From b79fdc76978515fba2c4f3b5b4f2e679c5ff1463 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:54 -0600 Subject: common: Drop flash.h from common header Move this uncommon header out of the common header. Fix up some style problems in flash.h while we are here. Signed-off-by: Simon Glass --- fs/cramfs/cramfs.c | 1 + fs/jffs2/jffs2_1pass.c | 1 + 2 files changed, 2 insertions(+) (limited to 'fs') diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index 228f599d44..7ef48bbc06 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -25,6 +25,7 @@ */ #include +#include #include #include #include diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 1115c8682e..a98745c50e 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -113,6 +113,7 @@ #include #include +#include #include #include #include -- cgit From 90526e9fbac47af16d70f323feae45d8d1b0f9b7 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:56 -0600 Subject: common: Drop net.h from common header Move this header out of the common header. Network support is used in quite a few places but it still does not warrant blanket inclusion. Note that this net.h header itself has quite a lot in it. It could be split into the driver-mode support, functions, structures, checksumming, etc. Signed-off-by: Simon Glass --- fs/ext4/ext4_common.h | 1 + fs/fat/fat.c | 1 + fs/fat/fat_write.c | 1 + 3 files changed, 3 insertions(+) (limited to 'fs') diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h index 4dff1914d9..beaee9c80b 100644 --- a/fs/ext4/ext4_common.h +++ b/fs/ext4/ext4_common.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #if defined(CONFIG_EXT4_WRITE) #include "ext4_journal.h" diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 68ce658386..f68c8f73c4 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 4f96699e36..d2aff09200 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include -- cgit From 0528979fa7ab7853faaf2ecf34b7721dd4c0b383 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:57 -0600 Subject: part: Drop disk_partition_t typedef We should not be using typedefs and these make it harder to use forward declarations (to reduce header file inclusions). Drop the typedef. Signed-off-by: Simon Glass --- fs/btrfs/btrfs.c | 3 ++- fs/btrfs/btrfs.h | 2 +- fs/btrfs/dev.c | 2 +- fs/ext4/dev.c | 4 ++-- fs/ext4/ext4fs.c | 2 +- fs/fat/fat.c | 6 +++--- fs/fs.c | 6 +++--- fs/fs_internal.c | 2 +- fs/reiserfs/dev.c | 4 ++-- fs/sandbox/sandboxfs.c | 2 +- fs/ubifs/ubifs.c | 2 +- fs/zfs/dev.c | 4 ++-- 12 files changed, 20 insertions(+), 19 deletions(-) (limited to 'fs') diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index 2e3985e385..de16217d0d 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -75,7 +75,8 @@ static int readdir_callback(const struct btrfs_root *root, return 0; } -int btrfs_probe(struct blk_desc *fs_dev_desc, disk_partition_t *fs_partition) +int btrfs_probe(struct blk_desc *fs_dev_desc, + struct disk_partition *fs_partition) { btrfs_blk_desc = fs_dev_desc; btrfs_part_info = fs_partition; diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index 986d078679..25a8cf6a87 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -36,7 +36,7 @@ static inline u64 btrfs_name_hash(const char *name, int len) /* dev.c */ extern struct blk_desc *btrfs_blk_desc; -extern disk_partition_t *btrfs_part_info; +extern struct disk_partition *btrfs_part_info; int btrfs_devread(u64, int, void *); diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c index ada3800f1e..e686abc5e3 100644 --- a/fs/btrfs/dev.c +++ b/fs/btrfs/dev.c @@ -10,7 +10,7 @@ #include struct blk_desc *btrfs_blk_desc; -disk_partition_t *btrfs_part_info; +struct disk_partition *btrfs_part_info; int btrfs_devread(u64 address, int byte_len, void *buf) { diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c index 29076880bc..0d4f756aa5 100644 --- a/fs/ext4/dev.c +++ b/fs/ext4/dev.c @@ -33,9 +33,9 @@ lbaint_t part_offset; static struct blk_desc *ext4fs_blk_desc; -static disk_partition_t *part_info; +static struct disk_partition *part_info; -void ext4fs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info) +void ext4fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info) { assert(rbdd->blksz == (1 << rbdd->log2blksz)); ext4fs_blk_desc = rbdd; diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 96ca276839..ad71f5ab6e 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -227,7 +227,7 @@ int ext4fs_read(char *buf, loff_t offset, loff_t len, loff_t *actread) } int ext4fs_probe(struct blk_desc *fs_dev_desc, - disk_partition_t *fs_partition) + struct disk_partition *fs_partition) { ext4fs_set_blk_dev(fs_dev_desc, fs_partition); diff --git a/fs/fat/fat.c b/fs/fat/fat.c index f68c8f73c4..425d877c74 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -36,7 +36,7 @@ static void downcase(char *str, size_t len) } static struct blk_desc *cur_dev; -static disk_partition_t cur_part_info; +static struct disk_partition cur_part_info; #define DOS_BOOT_MAGIC_OFFSET 0x1fe #define DOS_FS_TYPE_OFFSET 0x36 @@ -57,7 +57,7 @@ static int disk_read(__u32 block, __u32 nr_blocks, void *buf) return ret; } -int fat_set_blk_dev(struct blk_desc *dev_desc, disk_partition_t *info) +int fat_set_blk_dev(struct blk_desc *dev_desc, struct disk_partition *info) { ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); @@ -88,7 +88,7 @@ int fat_set_blk_dev(struct blk_desc *dev_desc, disk_partition_t *info) int fat_register_device(struct blk_desc *dev_desc, int part_no) { - disk_partition_t info; + struct disk_partition info; /* First close any currently found FAT filesystem */ cur_dev = NULL; diff --git a/fs/fs.c b/fs/fs.c index 0c66d60477..e3de25da5b 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -24,11 +24,11 @@ DECLARE_GLOBAL_DATA_PTR; static struct blk_desc *fs_dev_desc; static int fs_dev_part; -static disk_partition_t fs_partition; +static struct disk_partition fs_partition; static int fs_type = FS_TYPE_ANY; static inline int fs_probe_unsupported(struct blk_desc *fs_dev_desc, - disk_partition_t *fs_partition) + struct disk_partition *fs_partition) { printf("** Unrecognized filesystem type **\n"); return -1; @@ -135,7 +135,7 @@ struct fstype_info { */ bool null_dev_desc_ok; int (*probe)(struct blk_desc *fs_dev_desc, - disk_partition_t *fs_partition); + struct disk_partition *fs_partition); int (*ls)(const char *dirname); int (*exists)(const char *filename); int (*size)(const char *filename, loff_t *size); diff --git a/fs/fs_internal.c b/fs/fs_internal.c index d369c43ca6..1ff804d13b 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -10,7 +10,7 @@ #include #include -int fs_devread(struct blk_desc *blk, disk_partition_t *partition, +int fs_devread(struct blk_desc *blk, struct disk_partition *partition, lbaint_t sector, int byte_offset, int byte_len, char *buf) { unsigned block_len; diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c index c6b67795df..5d9c26489a 100644 --- a/fs/reiserfs/dev.c +++ b/fs/reiserfs/dev.c @@ -12,10 +12,10 @@ #include "reiserfs_private.h" static struct blk_desc *reiserfs_blk_desc; -static disk_partition_t *part_info; +static struct disk_partition *part_info; -void reiserfs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info) +void reiserfs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info) { reiserfs_blk_desc = rbdd; part_info = info; diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c index af47224b6c..5851fe2434 100644 --- a/fs/sandbox/sandboxfs.c +++ b/fs/sandbox/sandboxfs.c @@ -8,7 +8,7 @@ #include #include -int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info) +int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info) { /* * Only accept a NULL struct blk_desc for the sandbox, which is when diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index e097d28444..742c2f47eb 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -549,7 +549,7 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename) return 0; } -int ubifs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info) +int ubifs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info) { if (rbdd) { debug("UBIFS cannot be used with normal block devices\n"); diff --git a/fs/zfs/dev.c b/fs/zfs/dev.c index 3cdb9e03ed..251e7d1f74 100644 --- a/fs/zfs/dev.c +++ b/fs/zfs/dev.c @@ -14,9 +14,9 @@ #include static struct blk_desc *zfs_blk_desc; -static disk_partition_t *part_info; +static struct disk_partition *part_info; -void zfs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info) +void zfs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info) { zfs_blk_desc = rbdd; part_info = info; -- cgit From e6f6f9e64882ddf242437c73fdd9ff06a8eb7c21 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:58 -0600 Subject: common: Drop part.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- fs/btrfs/dev.c | 1 + fs/btrfs/super.c | 4 +++- fs/ext4/ext4_common.c | 2 ++ fs/ext4/ext4_journal.c | 1 + fs/ext4/ext4_write.c | 2 ++ fs/ext4/ext4fs.c | 2 ++ fs/fs.c | 1 + fs/fs_internal.c | 1 + fs/sandbox/sandboxfs.c | 1 + fs/ubifs/ubifs.c | 1 + 10 files changed, 15 insertions(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c index e686abc5e3..1e5b83235a 100644 --- a/fs/btrfs/dev.c +++ b/fs/btrfs/dev.c @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index b693a073fc..f80c148627 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -5,9 +5,11 @@ * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz */ -#include "btrfs.h" +#include #include +#include #include +#include "btrfs.h" #define BTRFS_SUPER_FLAG_SUPP (BTRFS_HEADER_FLAG_WRITTEN \ | BTRFS_HEADER_FLAG_RELOC \ diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 5bf78b530a..9adef57476 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -19,10 +19,12 @@ */ #include +#include #include #include #include #include +#include #include #include #include diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c index 0ceb73d9c9..2a8d397af4 100644 --- a/fs/ext4/ext4_journal.c +++ b/fs/ext4/ext4_journal.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index 67aeba1339..ce1fddc9a4 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -22,8 +22,10 @@ #include +#include #include #include +#include #include #include #include "ext4_common.h" diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index ad71f5ab6e..4c89152ce4 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -21,11 +21,13 @@ */ #include +#include #include #include #include "ext4_common.h" #include #include +#include #include int ext4fs_symlinknest; diff --git a/fs/fs.c b/fs/fs.c index e3de25da5b..061917a984 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/fs_internal.c b/fs/fs_internal.c index 1ff804d13b..115c010ef8 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c index 5851fe2434..4ae41d5b4d 100644 --- a/fs/sandbox/sandboxfs.c +++ b/fs/sandbox/sandboxfs.c @@ -7,6 +7,7 @@ #include #include #include +#include int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info) { diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 742c2f47eb..bb35512380 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -17,6 +17,7 @@ #include #include #include "ubifs.h" +#include #include #include -- cgit From 691d719db7183dfb1d1360efed4c5e9f6899095f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:02 -0600 Subject: common: Drop init.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- fs/ubifs/io.c | 1 + 1 file changed, 1 insertion(+) (limited to 'fs') diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 8148055f67..1389268b5f 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -59,6 +59,7 @@ */ #ifndef __UBOOT__ +#include #include #include #include -- cgit From 09140113108541b95d340f3c7b6ee597d31ccc73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:03 -0600 Subject: command: Remove the cmd_tbl_t typedef We should not use typedefs in U-Boot. They cannot be used as forward declarations which means that header files must include the full header to access them. Drop the typedef and rename the struct to remove the _s suffix which is now not useful. This requires quite a few header-file additions. Signed-off-by: Simon Glass --- fs/fs.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'fs') diff --git a/fs/fs.c b/fs/fs.c index 061917a984..5591c65eaa 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -3,6 +3,7 @@ * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. */ +#include #include #include #include @@ -644,8 +645,8 @@ int fs_ln(const char *fname, const char *target) return ret; } -int do_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype) +int do_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype) { loff_t size; @@ -663,8 +664,8 @@ int do_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return 0; } -int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype) +int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype) { unsigned long addr; const char *addr_str; @@ -737,8 +738,8 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return 0; } -int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype) +int do_ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype) { if (argc < 2) return CMD_RET_USAGE; @@ -763,8 +764,8 @@ int file_exists(const char *dev_type, const char *dev_part, const char *file, return fs_exists(file); } -int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype) +int do_save(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype) { unsigned long addr; const char *filename; @@ -805,8 +806,8 @@ int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return 0; } -int do_fs_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype) +int do_fs_uuid(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype) { int ret; char uuid[37]; @@ -830,7 +831,7 @@ int do_fs_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return CMD_RET_SUCCESS; } -int do_fs_type(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_fs_type(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct fstype_info *info; @@ -852,7 +853,7 @@ int do_fs_type(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_SUCCESS; } -int do_rm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], +int do_rm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], int fstype) { if (argc != 4) @@ -867,7 +868,7 @@ int do_rm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return 0; } -int do_mkdir(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], +int do_mkdir(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], int fstype) { int ret; @@ -887,7 +888,7 @@ int do_mkdir(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return 0; } -int do_ln(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], +int do_ln(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], int fstype) { if (argc != 5) -- cgit From f7ae49fc4f363a803dab3be078e93ead8e75a8e9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:05 -0600 Subject: common: Drop log.h from common header Move this header out of the common header. Signed-off-by: Simon Glass --- fs/btrfs/chunk-map.c | 1 + fs/btrfs/compression.c | 1 + fs/btrfs/ctree.c | 1 + fs/btrfs/super.c | 1 + fs/ext4/dev.c | 1 + fs/ext4/ext4_common.c | 1 + fs/ext4/ext4_journal.c | 1 + fs/ext4/ext4_write.c | 1 + fs/fat/fat.c | 1 + fs/fat/fat_write.c | 1 + fs/fs.c | 1 + fs/fs_internal.c | 1 + fs/ubifs/budget.c | 1 + fs/ubifs/debug.c | 1 + fs/ubifs/gc.c | 1 + fs/ubifs/io.c | 1 + fs/ubifs/log.c | 1 + fs/ubifs/lprops.c | 1 + fs/ubifs/lpt.c | 1 + fs/ubifs/lpt_commit.c | 1 + fs/ubifs/master.c | 1 + fs/ubifs/orphan.c | 1 + fs/ubifs/recovery.c | 1 + fs/ubifs/replay.c | 1 + fs/ubifs/sb.c | 1 + fs/ubifs/scan.c | 1 + fs/ubifs/super.c | 1 + fs/ubifs/tnc.c | 1 + fs/ubifs/tnc_misc.c | 1 + fs/ubifs/ubifs.c | 1 + fs/zfs/zfs.c | 1 + 31 files changed, 31 insertions(+) (limited to 'fs') diff --git a/fs/btrfs/chunk-map.c b/fs/btrfs/chunk-map.c index 0c9a659f8f..2e5be65067 100644 --- a/fs/btrfs/chunk-map.c +++ b/fs/btrfs/chunk-map.c @@ -6,6 +6,7 @@ */ #include "btrfs.h" +#include #include struct chunk_map_item { diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index b1884fc15e..59e4a94cb2 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -6,6 +6,7 @@ */ #include "btrfs.h" +#include #include #include #include diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 7fae383f15..28f98d43ad 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -6,6 +6,7 @@ */ #include "btrfs.h" +#include #include #include diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index f80c148627..913a4d402e 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c index 0d4f756aa5..168443de1f 100644 --- a/fs/ext4/dev.c +++ b/fs/ext4/dev.c @@ -29,6 +29,7 @@ #include #include #include "ext4_common.h" +#include lbaint_t part_offset; diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 9adef57476..c52cc400e1 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c index 2a8d397af4..1a340b4764 100644 --- a/fs/ext4/ext4_journal.c +++ b/fs/ext4/ext4_journal.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include "ext4_common.h" diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index ce1fddc9a4..f22af45d1b 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 425d877c74..7fd29470c1 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index d2aff09200..59cc0bae94 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/fs.c b/fs/fs.c index 5591c65eaa..ad4caaeb1e 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/fs_internal.c b/fs/fs_internal.c index 115c010ef8..8b19811a63 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 9eb5d3fed1..514f15f58c 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -20,6 +20,7 @@ #include "ubifs.h" #ifndef __UBOOT__ +#include #include #else #include diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 6835f86fec..2ff8f1a5f9 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -16,6 +16,7 @@ */ #include +#include #include #ifndef __UBOOT__ diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index f923d07652..6a4ada62c8 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c @@ -41,6 +41,7 @@ * good, and GC takes extra care when moving them. */ #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 1389268b5f..eb14b89544 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -60,6 +60,7 @@ #ifndef __UBOOT__ #include +#include #include #include #include diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index 5cbb8aa1b2..77ff52575e 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -16,6 +16,7 @@ */ #ifdef __UBOOT__ +#include #include #include #endif diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index a7c45dd5ec..a9e22abe6b 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -17,6 +17,7 @@ */ #ifdef __UBOOT__ +#include #include #include #endif diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index ebfb1d4dd7..62748b0210 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -33,6 +33,7 @@ #include "ubifs.h" #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index aa5956c52e..32938a8ffe 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -14,6 +14,7 @@ */ #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c index 2740aaee8b..055c654ae8 100644 --- a/fs/ubifs/master.c +++ b/fs/ubifs/master.c @@ -12,6 +12,7 @@ #include "ubifs.h" #ifdef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c index a67b3eec93..6aa2890ff0 100644 --- a/fs/ubifs/orphan.c +++ b/fs/ubifs/orphan.c @@ -7,6 +7,7 @@ * Author: Adrian Hunter */ +#include #include #include #include "ubifs.h" diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 3388efe2b7..6b6884fb20 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -36,6 +36,7 @@ */ #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c index 3a9fa4130e..aa7f281ef6 100644 --- a/fs/ubifs/replay.c +++ b/fs/ubifs/replay.c @@ -21,6 +21,7 @@ */ #ifdef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 599e1a35fb..1d49285c7d 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -16,6 +16,7 @@ #include "ubifs.h" #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c index 876a6ee661..7a6e46df5d 100644 --- a/fs/ubifs/scan.c +++ b/fs/ubifs/scan.c @@ -17,6 +17,7 @@ #ifdef __UBOOT__ #include +#include #include #include #endif diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index b38513660b..93f268b4cc 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -15,6 +15,7 @@ */ #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index fc6fdaff8d..0dc7886ac4 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -19,6 +19,7 @@ */ #ifndef __UBOOT__ +#include #include #include #include diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c index dfa9e91903..e4cd785b9f 100644 --- a/fs/ubifs/tnc_misc.c +++ b/fs/ubifs/tnc_misc.c @@ -16,6 +16,7 @@ */ #ifdef __UBOOT__ +#include #include #include #endif diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index bb35512380..70beb848e1 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include "ubifs.h" diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index 4331c16064..1fec96cd5c 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include -- cgit From eb41d8a1befc45a30ccdab68fa3e099528486ffe Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:08 -0600 Subject: common: Drop linux/bug.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- fs/ubifs/tnc.c | 1 + fs/yaffs2/yaffs_mtdif2.c | 1 + fs/yaffs2/yportenv.h | 1 + 3 files changed, 3 insertions(+) (limited to 'fs') diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 0dc7886ac4..41c7d5666f 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -25,6 +25,7 @@ #include #include #else +#include #include #include #include diff --git a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c index 0d9d5cc4b1..81a4d964f3 100644 --- a/fs/yaffs2/yaffs_mtdif2.c +++ b/fs/yaffs2/yaffs_mtdif2.c @@ -15,6 +15,7 @@ /* XXX U-BOOT XXX */ #include +#include #include #include "yportenv.h" diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h index 251eba0792..081391a1d0 100644 --- a/fs/yaffs2/yportenv.h +++ b/fs/yaffs2/yportenv.h @@ -17,6 +17,7 @@ #ifndef __YPORTENV_H__ #define __YPORTENV_H__ +#include #include /* Definition of types */ -- cgit From 1af3c7f422f627a544fec13e436d1a7975e39e73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:09 -0600 Subject: common: Drop linux/stringify.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- fs/ubifs/super.c | 1 + 1 file changed, 1 insertion(+) (limited to 'fs') diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 93f268b4cc..2f6b25d338 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -38,6 +38,7 @@ #include #include "ubifs.h" #include +#include #include struct dentry; -- cgit From cd93d625fd751d55c729c78b10f82109d56a5f1d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:13 -0600 Subject: common: Drop linux/bitops.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- fs/ubifs/lpt_commit.c | 1 + fs/ubifs/super.c | 1 + fs/ubifs/tnc.c | 1 + 3 files changed, 3 insertions(+) (limited to 'fs') diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index 32938a8ffe..897d001430 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -20,6 +20,7 @@ #include #include #else +#include #include #include #include "crc16.h" diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 2f6b25d338..e3a4c0bca2 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 41c7d5666f..e8b8f16838 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -25,6 +25,7 @@ #include #include #else +#include #include #include #include -- cgit