From: Simon Glass <simon.glass@canonical.com> Use the existing linux/blk_types.h header for blk_opf_t instead of defining it locally in ext4_uboot.h. This avoids duplication and uses the proper __bitwise annotation for type safety. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/ext4_uboot.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 08d28fd01ad..68acbd489f4 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -78,10 +78,12 @@ * atomic_t, atomic64_t are now in asm-generic/atomic.h * MAX_JIFFY_OFFSET is now in linux/jiffies.h * BDEVNAME_SIZE is now in linux/blkdev.h + * blk_opf_t is now in linux/blk_types.h */ #include <asm-generic/atomic.h> #include <linux/jiffies.h> #include <linux/blkdev.h> +#include <linux/blk_types.h> /* atomic_dec_if_positive, atomic_add_unless, etc. are now in asm-generic/atomic.h */ @@ -507,8 +509,7 @@ struct folio; /* qsize_t - quota size type */ typedef long long qsize_t; -/* blk_opf_t - block operation flags */ -typedef unsigned int blk_opf_t; +/* blk_opf_t is in linux/blk_types.h */ /* bh_end_io_t and struct buffer_head are in linux/buffer_head.h */ -- 2.43.0