Commit e20a7693 authored Jun 01, 2020 by Matthew Wilcox (Oracle) Committed by Linus Torvalds Jun 02, 2020

f2fs: pass the inode to f2fs_mpage_readpages



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@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Acked-by: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Gao Xiang <gaoxiang25@huawei.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Link: http://lkml.kernel.org/r/20200414150233.24495-24-willy@infradead.org


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 23323196

fs/f2fs/data.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2177,12 +2177,11 @@ out:
		* use ->readpage() or do the necessary surgery to decouple ->readpages()
		* from read-ahead.
		*/
		static int f2fs_mpage_readpages(struct address_space *mapping,
		static int f2fs_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;
		struct f2fs_map_blocks map;
		#ifdef CONFIG_F2FS_FS_COMPRESSION
		struct compress_ctx cc = {
		@@ -2294,7 +2293,7 @@ static int f2fs_read_data_page(struct file file, struct page page)
		if (f2fs_has_inline_data(inode))
		ret = f2fs_read_inline_data(inode, page);
		if (ret == -EAGAIN)
		ret = f2fs_mpage_readpages(page_file_mapping(page), NULL, page);
		ret = f2fs_mpage_readpages(inode, NULL, page);
		return ret;
		}

		@@ -2311,7 +2310,7 @@ static void f2fs_readahead(struct readahead_control *rac)
		if (f2fs_has_inline_data(inode))
		return;

		f2fs_mpage_readpages(rac->mapping, rac, NULL);
		f2fs_mpage_readpages(inode, rac, NULL);
		}

		int f2fs_encrypt_one_page(struct f2fs_io_info *fio)

Admin message