diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-04-29 10:40:40 -0400 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 16:21:44 -0400 |
| commit | 2c69e2057962b6bd76d72446453862eb59325b49 (patch) | |
| tree | 618562570ea6415752e472f1faba16ecb9c841bf /block/fops.c | |
| parent | 7479c505b4ab5ed5f81f35fdd68c44c58d6f0439 (diff) | |
| download | linux-stable-2c69e2057962b6bd76d72446453862eb59325b49.tar.gz linux-stable-2c69e2057962b6bd76d72446453862eb59325b49.tar.bz2 linux-stable-2c69e2057962b6bd76d72446453862eb59325b49.zip | |
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: Matthew Wilcox (Oracle) <willy@infradead.org>
Diffstat (limited to 'block/fops.c')
| -rw-r--r-- | block/fops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/fops.c b/block/fops.c index 712affe56e29..06feb41d798b 100644 --- a/block/fops.c +++ b/block/fops.c @@ -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, |