On Fri, Mar 20, 2020 at 07:22:27AM -0700, Matthew Wilcox wrote:
> From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
>
> This function now only uses the mapping argument to look up the inode,
> and both callers already have the inode, so just pass the inode instead
> of the mapping.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
> Reviewed-by: William Kucharski <william.kucharski@xxxxxxxxxx>
> ---
> fs/ext4/ext4.h | 2 +-
> fs/ext4/inode.c | 4 ++--
> fs/ext4/readpage.c | 3 +--
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 1570a0b51b73..bc1b34ba6eab 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -3278,7 +3278,7 @@ static inline void ext4_set_de_type(struct super_block *sb,
> }
>
> /* readpages.c */
> -extern int ext4_mpage_readpages(struct address_space *mapping,
> +extern int ext4_mpage_readpages(struct inode *inode,
> struct readahead_control *rac, struct page *page);
> extern int __init ext4_init_post_read_processing(void);
> extern void ext4_exit_post_read_processing(void);
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index d674c5f9066c..4f3703c1408d 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -3226,7 +3226,7 @@ static int ext4_readpage(struct file *file, struct page *page)
> ret = ext4_readpage_inline(inode, page);
>
> if (ret == -EAGAIN)
> - return ext4_mpage_readpages(page->mapping, NULL, page);
> + return ext4_mpage_readpages(inode, NULL, page);
>
> return ret;
> }
> @@ -3239,7 +3239,7 @@ static void ext4_readahead(struct readahead_control *rac)
> if (ext4_has_inline_data(inode))
> return;
>
> - ext4_mpage_readpages(rac->mapping, rac, NULL);
> + ext4_mpage_readpages(inode, rac, NULL);
> }
>
> static void ext4_invalidatepage(struct page *page, unsigned int offset,
> diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
> index 66275f25235d..5761e9961682 100644
> --- a/fs/ext4/readpage.c
> +++ b/fs/ext4/readpage.c
> @@ -221,13 +221,12 @@ static inline loff_t ext4_readpage_limit(struct inode *inode)
> return i_size_read(inode);
> }
>
> -int ext4_mpage_readpages(struct address_space *mapping,
> +int ext4_mpage_readpages(struct inode *inode,
> struct readahead_control *rac, struct page *page)
> {
> struct bio *bio = NULL;
> sector_t last_block_in_bio = 0;
>
> - struct inode *inode = mapping->host;
> const unsigned blkbits = inode->i_blkbits;
> const unsigned blocks_per_page = PAGE_SIZE >> blkbits;
> const unsigned blocksize = 1 << blkbits;
> --
Reviewed-by: Eric Biggers <ebiggers@xxxxxxxxxx>
- Eric
