diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-04-29 17:12:16 +0200 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 22:21:45 +0200 |
| commit | a2e20a25a1470ebf33b270197fca8d3cab728f07 (patch) | |
| tree | 273b871b5264b34b95673e46da861c406d4d67e7 /fs/erofs/zdata.c | |
| parent | efs: Convert efs symlinks to read_folio (diff) | |
| download | linux-a2e20a25a1470ebf33b270197fca8d3cab728f07.tar.xz linux-a2e20a25a1470ebf33b270197fca8d3cab728f07.zip | |
erofs: Convert erofs zdata to read_folio
This is a "weak" conversion which converts straight back to using pages.
A full conversion should be performed at some point, hopefully by
someone familiar with the filesystem.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Diffstat (limited to '')
| -rw-r--r-- | fs/erofs/zdata.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index e6dea6dfca16..95efc127b2ba 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -791,7 +791,7 @@ err_out: static bool z_erofs_get_sync_decompress_policy(struct erofs_sb_info *sbi, unsigned int readahead_pages) { - /* auto: enable for readpage, disable for readahead */ + /* auto: enable for read_folio, disable for readahead */ if ((sbi->opt.sync_decompress == EROFS_SYNC_DECOMPRESS_AUTO) && !readahead_pages) return true; @@ -1488,8 +1488,9 @@ skip: } } -static int z_erofs_readpage(struct file *file, struct page *page) +static int z_erofs_read_folio(struct file *file, struct folio *folio) { + struct page *page = &folio->page; struct inode *const inode = page->mapping->host; struct erofs_sb_info *const sbi = EROFS_I_SB(inode); struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode); @@ -1563,6 +1564,6 @@ static void z_erofs_readahead(struct readahead_control *rac) } const struct address_space_operations z_erofs_aops = { - .readpage = z_erofs_readpage, + .read_folio = z_erofs_read_folio, .readahead = z_erofs_readahead, }; |