Make these two function signatures the same. This should enable more cleanup in the future, but for now it helps ensure a bit of type safety and cleans up the filesystems a bit. Matthew Wilcox (Oracle) (4): jffs2: Pass the file pointer to jffs2_do_readpage_unlock() nfs: Pass the file pointer to nfs_symlink_filler() fs: Change the type of filler_t mm/filemap: Hoist filler_t decision to the top of do_read_cache_folio() fs/gfs2/aops.c | 29 ++++++++++--------------- fs/jffs2/file.c | 9 ++++---- fs/jffs2/gc.c | 2 +- fs/jffs2/os-linux.h | 2 +- fs/nfs/symlink.c | 16 +++++++------- include/linux/pagemap.h | 6 +++--- mm/filemap.c | 47 +++++++++++++++++++---------------------- 7 files changed, 50 insertions(+), 61 deletions(-) -- 2.34.1