public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ocfs2: Convert ocfs2 to read_folio

Browse source 
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>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-04-29 11:12:16 -04:00
parent 933906f8e8
commit bb9263fc14
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ocfs2/alloc.c
View file

@ -7427,7 +7427,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,
/* /*
* No need to worry about the data page here - it's been * No need to worry about the data page here - it's been
* truncated already and inline data doesn't need it for * truncated already and inline data doesn't need it for
* pushing zero's to disk, so we'll let readpage pick it up * pushing zero's to disk, so we'll let read_folio pick it up
* later. * later.
*/ */
if (trunc) { if (trunc) {

5
fs/ocfs2/aops.c
View file

@ -275,8 +275,9 @@ out:
return ret; return ret;
} }
static int ocfs2_readpage(struct file *file, struct page *page) static int ocfs2_read_folio(struct file *file, struct folio *folio)
{ {
struct page *page = &folio->page;
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct ocfs2_inode_info *oi = OCFS2_I(inode); struct ocfs2_inode_info *oi = OCFS2_I(inode);
loff_t start = (loff_t)page->index << PAGE_SHIFT; loff_t start = (loff_t)page->index << PAGE_SHIFT;
@ -2454,7 +2455,7 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
const struct address_space_operations ocfs2_aops = { const struct address_space_operations ocfs2_aops = {
.dirty_folio = block_dirty_folio, .dirty_folio = block_dirty_folio,
.readpage = ocfs2_readpage, .read_folio = ocfs2_read_folio,
.readahead = ocfs2_readahead, .readahead = ocfs2_readahead,
.writepage = ocfs2_writepage, .writepage = ocfs2_writepage,
.write_begin = ocfs2_write_begin, .write_begin = ocfs2_write_begin,

2
fs/ocfs2/file.c
View file

@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* /*
* buffered reads protect themselves in ->readpage(). O_DIRECT reads * buffered reads protect themselves in ->read_folio(). O_DIRECT reads
* need locks to protect pending reads from racing with truncate. * need locks to protect pending reads from racing with truncate.
*/ */
if (direct_io) { if (direct_io) {

5
fs/ocfs2/symlink.c
View file

@ -52,8 +52,9 @@
#include "buffer_head_io.h" #include "buffer_head_io.h"
static int ocfs2_fast_symlink_readpage(struct file *unused, struct page *page) static int ocfs2_fast_symlink_read_folio(struct file *f, struct folio *folio)
{ {
struct page *page = &folio->page;
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
int status = ocfs2_read_inode_block(inode, &bh); int status = ocfs2_read_inode_block(inode, &bh);
@ -81,7 +82,7 @@ static int ocfs2_fast_symlink_readpage(struct file *unused, struct page *page)
} }
const struct address_space_operations ocfs2_fast_symlink_aops = { const struct address_space_operations ocfs2_fast_symlink_aops = {
.readpage = ocfs2_fast_symlink_readpage, .read_folio = ocfs2_fast_symlink_read_folio,
}; };
const struct inode_operations ocfs2_symlink_inode_operations = { const struct inode_operations ocfs2_symlink_inode_operations = {