From d4388340ae0bc8397ef5b24342279f7739982918 Mon Sep 17 00:00:00 2001

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Date: Mon, 1 Jun 2020 21:47:02 -0700

Subject: [Backport d4388340ae0b] fs: convert mpage_readpages to

 mpage_readahead

Implement the new readahead aop and convert all callers (block_dev,

exfat, ext2, fat, gfs2, hpfs, isofs, jfs, nilfs2, ocfs2, omfs, qnx6,

reiserfs & udf).

The callers are all trivial except for GFS2 & OCFS2.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Reviewed-by: Junxiao Bi <junxiao.bi@oracle.com> # ocfs2

Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> # ocfs2

Reviewed-by: Dave Chinner <dchinner@redhat.com>

Reviewed-by: John Hubbard <jhubbard@nvidia.com>

Reviewed-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: William Kucharski <william.kucharski@oracle.com>

Cc: Chao Yu <yuchao0@huawei.com>

Cc: Cong Wang <xiyou.wangcong@gmail.com>

Cc: Darrick J. Wong <darrick.wong@oracle.com>

Cc: Eric Biggers <ebiggers@google.com>

Cc: Gao Xiang <gaoxiang25@huawei.com>

Cc: Jaegeuk Kim <jaegeuk@kernel.org>

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-17-willy@infradead.org

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

---

 src/inode.c | 7 +++----

 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/inode.c b/src/inode.c

index 06887492f54b791506d2f7c76eb3ef073b72026d..785ead346543cb54d440ee1797bee941810f72b7 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -372,10 +372,9 @@ static int exfat_readpage(struct file *file, struct page *page)

 	return mpage_readpage(page, exfat_get_block);

 }

-static int exfat_readpages(struct file *file, struct address_space *mapping,

-		struct list_head *pages, unsigned int nr_pages)

+static void exfat_readahead(struct readahead_control *rac)

 {

-	return mpage_readpages(mapping, pages, nr_pages, exfat_get_block);

+	mpage_readahead(rac, exfat_get_block);

 }

 static int exfat_writepage(struct page *page, struct writeback_control *wbc)

@@ -502,7 +501,7 @@ int exfat_block_truncate_page(struct inode *inode, loff_t from)

 static const struct address_space_operations exfat_aops = {

 	.readpage	= exfat_readpage,

-	.readpages	= exfat_readpages,

+	.readahead	= exfat_readahead,

 	.writepage	= exfat_writepage,

 	.writepages	= exfat_writepages,

 	.write_begin	= exfat_write_begin,

-- 

2.31.1