From: Simon Glass <simon.glass@canonical.com> Other archs provide the struct __kernel_fsid_t definition in linux/posix_types.h, but sandbox does not. Add it so we can remove the ext4l version. Signed-off-by: Simon Glass <simon.glass@canonical.com> --- arch/sandbox/include/asm/posix_types.h | 4 ++++ fs/ext4l/ext4_uboot.h | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/sandbox/include/asm/posix_types.h b/arch/sandbox/include/asm/posix_types.h index e1442c455bd..fe12ec9cc01 100644 --- a/arch/sandbox/include/asm/posix_types.h +++ b/arch/sandbox/include/asm/posix_types.h @@ -55,4 +55,8 @@ typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; #endif +typedef struct { + int val[2]; +} __kernel_fsid_t; + #endif diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index c975396dec4..f3dede424df 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -2067,11 +2067,6 @@ struct fid { }; }; -/* __kernel_fsid_t - must be before kstatfs */ -typedef struct { - int val[2]; -} __kernel_fsid_t; - /* uuid_to_fsid - convert UUID to fsid */ static inline __kernel_fsid_t uuid_to_fsid(const u8 *uuid) { -- 2.43.0