Commit d4388340 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew 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: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarWilliam 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2c817be

fs/block_dev.c

+3 −4
Original line number Diff line number Diff line
@@ -614,10 +614,9 @@ static int blkdev_readpage(struct file * file, struct page * page) 
	return block_read_full_page(page, blkdev_get_block);

}



static int blkdev_readpages(struct file *file, struct address_space *mapping,

			struct list_head *pages, unsigned nr_pages)

static void blkdev_readahead(struct readahead_control *rac)

{

	return mpage_readpages(mapping, pages, nr_pages, blkdev_get_block);

	mpage_readahead(rac, blkdev_get_block);

}



static int blkdev_write_begin(struct file *file, struct address_space *mapping,
@@ -2085,7 +2084,7 @@ static int blkdev_writepages(struct address_space *mapping, 


static const struct address_space_operations def_blk_aops = {

	.readpage	= blkdev_readpage,

	.readpages	= blkdev_readpages,

	.readahead	= blkdev_readahead,

	.writepage	= blkdev_writepage,

	.write_begin	= blkdev_write_begin,

	.write_end	= blkdev_write_end,

fs/exfat/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -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,

fs/ext2/inode.c

+4 −6
Original line number Diff line number Diff line
@@ -877,11 +877,9 @@ static int ext2_readpage(struct file *file, struct page *page) 
	return mpage_readpage(page, ext2_get_block);

}



static int

ext2_readpages(struct file *file, struct address_space *mapping,

		struct list_head *pages, unsigned nr_pages)

static void ext2_readahead(struct readahead_control *rac)

{

	return mpage_readpages(mapping, pages, nr_pages, ext2_get_block);

	mpage_readahead(rac, ext2_get_block);

}



static int
@@ -967,7 +965,7 @@ ext2_dax_writepages(struct address_space *mapping, struct writeback_control *wbc 


const struct address_space_operations ext2_aops = {

	.readpage		= ext2_readpage,

	.readpages		= ext2_readpages,

	.readahead		= ext2_readahead,

	.writepage		= ext2_writepage,

	.write_begin		= ext2_write_begin,

	.write_end		= ext2_write_end,
@@ -981,7 +979,7 @@ const struct address_space_operations ext2_aops = { 


const struct address_space_operations ext2_nobh_aops = {

	.readpage		= ext2_readpage,

	.readpages		= ext2_readpages,

	.readahead		= ext2_readahead,

	.writepage		= ext2_nobh_writepage,

	.write_begin		= ext2_nobh_write_begin,

	.write_end		= nobh_write_end,

fs/fat/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -210,10 +210,9 @@ static int fat_readpage(struct file *file, struct page *page) 
	return mpage_readpage(page, fat_get_block);

}



static int fat_readpages(struct file *file, struct address_space *mapping,

			 struct list_head *pages, unsigned nr_pages)

static void fat_readahead(struct readahead_control *rac)

{

	return mpage_readpages(mapping, pages, nr_pages, fat_get_block);

	mpage_readahead(rac, fat_get_block);

}



static void fat_write_failed(struct address_space *mapping, loff_t to)
@@ -344,7 +343,7 @@ int fat_block_truncate_page(struct inode *inode, loff_t from) 


static const struct address_space_operations fat_aops = {

	.readpage	= fat_readpage,

	.readpages	= fat_readpages,

	.readahead	= fat_readahead,

	.writepage	= fat_writepage,

	.writepages	= fat_writepages,

	.write_begin	= fat_write_begin,

fs/gfs2/aops.c

+8 −15
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, 
}



/**

 * gfs2_readpages - Read a bunch of pages at once

 * gfs2_readahead - Read a bunch of pages at once

 * @file: The file to read from

 * @mapping: Address space info

 * @pages: List of pages to read
@@ -590,31 +590,24 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, 
 *    obviously not something we'd want to do on too regular a basis.

 *    Any I/O we ignore at this time will be done via readpage later.

 * 2. We don't handle stuffed files here we let readpage do the honours.

 * 3. mpage_readpages() does most of the heavy lifting in the common case.

 * 3. mpage_readahead() does most of the heavy lifting in the common case.

 * 4. gfs2_block_map() is relied upon to set BH_Boundary in the right places.

 */



static int gfs2_readpages(struct file *file, struct address_space *mapping,

			  struct list_head *pages, unsigned nr_pages)

static void gfs2_readahead(struct readahead_control *rac)

{

	struct inode *inode = mapping->host;

	struct inode *inode = rac->mapping->host;

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_holder gh;

	int ret;



	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

	ret = gfs2_glock_nq(&gh);

	if (unlikely(ret))

	if (gfs2_glock_nq(&gh))

		goto out_uninit;

	if (!gfs2_is_stuffed(ip))

		ret = mpage_readpages(mapping, pages, nr_pages, gfs2_block_map);

		mpage_readahead(rac, gfs2_block_map);

	gfs2_glock_dq(&gh);

out_uninit:

	gfs2_holder_uninit(&gh);

	if (unlikely(gfs2_withdrawn(sdp)))

		ret = -EIO;

	return ret;

}



/**
@@ -833,7 +826,7 @@ static const struct address_space_operations gfs2_aops = { 
	.writepage = gfs2_writepage,

	.writepages = gfs2_writepages,

	.readpage = gfs2_readpage,

	.readpages = gfs2_readpages,

	.readahead = gfs2_readahead,

	.bmap = gfs2_bmap,

	.invalidatepage = gfs2_invalidatepage,

	.releasepage = gfs2_releasepage,
@@ -847,7 +840,7 @@ static const struct address_space_operations gfs2_jdata_aops = { 
	.writepage = gfs2_jdata_writepage,

	.writepages = gfs2_jdata_writepages,

	.readpage = gfs2_readpage,

	.readpages = gfs2_readpages,

	.readahead = gfs2_readahead,

	.set_page_dirty = jdata_set_page_dirty,

	.bmap = gfs2_bmap,

	.invalidatepage = gfs2_invalidatepage,

CRA Git | Maintained and supported by SUSTech CRA and CCSE