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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent a77f580a
...@@ -629,8 +629,9 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize) ...@@ -629,8 +629,9 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
} }
static int 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; struct inode *inode = page->mapping->host;
u32 to; u32 to;
int err; int err;
...@@ -837,7 +838,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, ...@@ -837,7 +838,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
const struct address_space_operations affs_aops_ofs = { const struct address_space_operations affs_aops_ofs = {
.dirty_folio = block_dirty_folio, .dirty_folio = block_dirty_folio,
.invalidate_folio = block_invalidate_folio, .invalidate_folio = block_invalidate_folio,
.readpage = affs_readpage_ofs, .read_folio = affs_read_folio_ofs,
//.writepage = affs_writepage_ofs, //.writepage = affs_writepage_ofs,
.write_begin = affs_write_begin_ofs, .write_begin = affs_write_begin_ofs,
.write_end = affs_write_end_ofs .write_end = affs_write_end_ofs
......
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
#include "affs.h" #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 buffer_head *bh;
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
char *link = page_address(page); char *link = page_address(page);
...@@ -67,7 +68,7 @@ static int affs_symlink_readpage(struct file *file, struct page *page) ...@@ -67,7 +68,7 @@ static int affs_symlink_readpage(struct file *file, struct page *page)
} }
const struct address_space_operations affs_symlink_aops = { 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 = { const struct inode_operations affs_symlink_inode_operations = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment