From: Simon Glass <simon.glass@canonical.com> Move iomap_bmap() and iomap_swapfile_activate() stubs to linux/iomap.h where other iomap stubs are already defined. This reduces ext4_uboot.h from 444 to 440 lines. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/ext4_uboot.h | 4 ---- include/linux/iomap.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 240d3bf2fb2..2954723e2de 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -218,10 +218,6 @@ struct path; /* File operations */ #define vmf_fs_error(e) ((vm_fault_t)VM_FAULT_SIGBUS) -/* iomap stubs */ -#define iomap_bmap(m, b, o) ({ (void)(m); (void)(b); (void)(o); 0UL; }) -#define iomap_swapfile_activate(s, f, sp, o) ({ (void)(s); (void)(f); (void)(sp); (void)(o); -EOPNOTSUPP; }) - /* * Additional stubs for dir.c */ diff --git a/include/linux/iomap.h b/include/linux/iomap.h index a426cf35f40..9240ef443bd 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -105,4 +105,8 @@ iomap_seek_data(struct inode *inode, loff_t pos, const struct iomap_ops *ops) return -EOPNOTSUPP; } +#define iomap_bmap(m, b, o) ({ (void)(m); (void)(b); (void)(o); 0UL; }) +#define iomap_swapfile_activate(s, f, sp, o) \ + ({ (void)(s); (void)(f); (void)(sp); (void)(o); -EOPNOTSUPP; }) + #endif /* LINUX_IOMAP_H */ -- 2.43.0