Commit 2c69e205 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fs: Convert block_read_full_page() to block_read_full_folio() 



This function is NOT converted to handle large folios, so include
an assert that the filesystem isn't passing one in.  Otherwise, use
the folio functions instead of the page functions, where they exist.
Convert all filesystems which use block_read_full_page().

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent 7479c505

block/fops.c

+3 −3
Original line number Diff line number Diff line
@@ -387,9 +387,9 @@ static int blkdev_writepage(struct page *page, struct writeback_control *wbc) 
	return block_write_full_page(page, blkdev_get_block, wbc);

}



static int blkdev_readpage(struct file * file, struct page * page)

static int blkdev_read_folio(struct file *file, struct folio *folio)

{

	return block_read_full_page(page, blkdev_get_block);

	return block_read_full_folio(folio, blkdev_get_block);

}



static void blkdev_readahead(struct readahead_control *rac)
@@ -425,7 +425,7 @@ static int blkdev_writepages(struct address_space *mapping, 
const struct address_space_operations def_blk_aops = {

	.dirty_folio	= block_dirty_folio,

	.invalidate_folio = block_invalidate_folio,

	.readpage	= blkdev_readpage,

	.read_folio	= blkdev_read_folio,

	.readahead	= blkdev_readahead,

	.writepage	= blkdev_writepage,

	.write_begin	= blkdev_write_begin,

fs/adfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ static int adfs_writepage(struct page *page, struct writeback_control *wbc) 
	return block_write_full_page(page, adfs_get_block, wbc);

}



static int adfs_readpage(struct file *file, struct page *page)

static int adfs_read_folio(struct file *file, struct folio *folio)

{

	return block_read_full_page(page, adfs_get_block);

	return block_read_full_folio(folio, adfs_get_block);

}



static void adfs_write_failed(struct address_space *mapping, loff_t to)
@@ -75,7 +75,7 @@ static sector_t _adfs_bmap(struct address_space *mapping, sector_t block) 
static const struct address_space_operations adfs_aops = {

	.dirty_folio	= block_dirty_folio,

	.invalidate_folio = block_invalidate_folio,

	.readpage	= adfs_readpage,

	.read_folio	= adfs_read_folio,

	.writepage	= adfs_writepage,

	.write_begin	= adfs_write_begin,

	.write_end	= generic_write_end,

fs/affs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -375,9 +375,9 @@ static int affs_writepage(struct page *page, struct writeback_control *wbc) 
	return block_write_full_page(page, affs_get_block, wbc);

}



static int affs_readpage(struct file *file, struct page *page)

static int affs_read_folio(struct file *file, struct folio *folio)

{

	return block_read_full_page(page, affs_get_block);

	return block_read_full_folio(folio, affs_get_block);

}



static void affs_write_failed(struct address_space *mapping, loff_t to)
@@ -455,7 +455,7 @@ static sector_t _affs_bmap(struct address_space *mapping, sector_t block) 
const struct address_space_operations affs_aops = {

	.dirty_folio	= block_dirty_folio,

	.invalidate_folio = block_invalidate_folio,

	.readpage = affs_readpage,

	.read_folio = affs_read_folio,

	.writepage = affs_writepage,

	.write_begin = affs_write_begin,

	.write_end = affs_write_end,

fs/befs/linuxvfs.c

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ MODULE_LICENSE("GPL"); 


static int befs_readdir(struct file *, struct dir_context *);

static int befs_get_block(struct inode *, sector_t, struct buffer_head *, int);

static int befs_readpage(struct file *file, struct page *page);

static int befs_read_folio(struct file *file, struct folio *folio);

static sector_t befs_bmap(struct address_space *mapping, sector_t block);

static struct dentry *befs_lookup(struct inode *, struct dentry *,

				  unsigned int);
@@ -87,7 +87,7 @@ static const struct inode_operations befs_dir_inode_operations = { 
};



static const struct address_space_operations befs_aops = {

	.readpage	= befs_readpage,

	.read_folio	= befs_read_folio,

	.bmap		= befs_bmap,

};
@@ -102,16 +102,16 @@ static const struct export_operations befs_export_operations = { 
};



/*

 * Called by generic_file_read() to read a page of data

 * Called by generic_file_read() to read a folio of data

 *

 * In turn, simply calls a generic block read function and

 * passes it the address of befs_get_block, for mapping file

 * positions to disk blocks.

 */

static int

befs_readpage(struct file *file, struct page *page)

befs_read_folio(struct file *file, struct folio *folio)

{

	return block_read_full_page(page, befs_get_block);

	return block_read_full_folio(folio, befs_get_block);

}



static sector_t

fs/bfs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -155,9 +155,9 @@ static int bfs_writepage(struct page *page, struct writeback_control *wbc) 
	return block_write_full_page(page, bfs_get_block, wbc);

}



static int bfs_readpage(struct file *file, struct page *page)

static int bfs_read_folio(struct file *file, struct folio *folio)

{

	return block_read_full_page(page, bfs_get_block);

	return block_read_full_folio(folio, bfs_get_block);

}



static void bfs_write_failed(struct address_space *mapping, loff_t to)
@@ -189,7 +189,7 @@ static sector_t bfs_bmap(struct address_space *mapping, sector_t block) 
const struct address_space_operations bfs_aops = {

	.dirty_folio	= block_dirty_folio,

	.invalidate_folio = block_invalidate_folio,

	.readpage	= bfs_readpage,

	.read_folio	= bfs_read_folio,

	.writepage	= bfs_writepage,

	.write_begin	= bfs_write_begin,

	.write_end	= generic_write_end,