diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-04-29 11:12:16 -0400 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 16:21:44 -0400 |
| commit | 1b6f3c8731e9550317a66117a197572c86b0e1c3 (patch) | |
| tree | d1d02b8f8acd7af3f6f551180b8f17ae31a1f523 | |
| parent | a77f580a2d4645ee0bec8679c377900b95863260 (diff) | |
| download | lwn-1b6f3c8731e9550317a66117a197572c86b0e1c3.tar.gz lwn-1b6f3c8731e9550317a66117a197572c86b0e1c3.zip | |
affs: Convert affs 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>
| -rw-r--r-- | fs/affs/file.c | 5 | ||||
| -rw-r--r-- | fs/affs/symlink.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c index 5da562cc7fb7..cd00a4c68a12 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -629,8 +629,9 @@ out: } static int -affs_readpage_ofs(struct file *file, struct page *page) +affs_read_folio_ofs(struct file *file, struct folio *folio) { + struct page *page = &folio->page; struct inode *inode = page->mapping->host; u32 to; int err; @@ -837,7 +838,7 @@ err_bh: const struct address_space_operations affs_aops_ofs = { .dirty_folio = block_dirty_folio, .invalidate_folio = block_invalidate_folio, - .readpage = affs_readpage_ofs, + .read_folio = affs_read_folio_ofs, //.writepage = affs_writepage_ofs, .write_begin = affs_write_begin_ofs, .write_end = affs_write_end_ofs diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c index a7531b26e8f0..31d6446dc166 100644 --- a/fs/affs/symlink.c +++ b/fs/affs/symlink.c @@ -11,8 +11,9 @@ #include "affs.h" -static int affs_symlink_readpage(struct file *file, struct page *page) +static int affs_symlink_read_folio(struct file *file, struct folio *folio) { + struct page *page = &folio->page; struct buffer_head *bh; struct inode *inode = page->mapping->host; char *link = page_address(page); @@ -67,7 +68,7 @@ fail: } const struct address_space_operations affs_symlink_aops = { - .readpage = affs_symlink_readpage, + .read_folio = affs_symlink_read_folio, }; const struct inode_operations affs_symlink_inode_operations = { |