From: Simon Glass <simon.glass@canonical.com> Move this filemap function to linux/pagemap.h alongside the other filemap_ stubs already defined there. This reduces ext4_uboot.h from 547 to 545 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 | 2 -- include/linux/pagemap.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 0c214501cef..f1c4a5a0fca 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -467,8 +467,6 @@ int sync_filesystem(void *sb); #include <asm-generic/bitops/lock.h> /* smp_mb__after_atomic is now in linux/smp.h */ #define ktime_get_coarse_real_ts64(ts) do { (ts)->tv_sec = 0; (ts)->tv_nsec = 0; } while (0) -#define filemap_fdatawait_range_keep_errors(m, s, e) \ - ({ (void)(m); (void)(s); (void)(e); 0; }) #define crc32_be(crc, p, len) crc32(crc, p, len) /* ext4l support functions (support.c) */ diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index eb689fa885f..22c7f05c57e 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -155,6 +155,8 @@ void mapping_clear_folio_cache(struct address_space *mapping); #define filemap_fdatawrite_range(m, s, e) ({ (void)(m); (void)(s); (void)(e); 0; }) #define filemap_flush(m) ({ (void)(m); 0; }) #define filemap_write_and_wait(m) ({ (void)(m); 0; }) +#define filemap_fdatawait_range_keep_errors(m, s, e) \ + ({ (void)(m); (void)(s); (void)(e); 0; }) #define filemap_release_folio(folio, gfp) ({ (void)(folio); (void)(gfp); 1; }) #define mapping_tagged(m, t) (0) #define tag_pages_for_writeback(m, s, e) do { } while (0) -- 2.43.0