niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

fuse: Convert from launder_page to launder_folio

Browse source 
Straightforward conversion although the helper functions still assume
a single page.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs
This commit is contained in:
Matthew Wilcox (Oracle) 2022-02-09 20:21:56 +00:00
parent ff2b48b965
commit 2bf06b8e64
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/fuse/dir.c
View file

@ -1773,7 +1773,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
/* /*
* Only call invalidate_inode_pages2() after removing * Only call invalidate_inode_pages2() after removing
* FUSE_NOWRITE, otherwise fuse_launder_page() would deadlock. * FUSE_NOWRITE, otherwise fuse_launder_folio() would deadlock.
*/ */
if ((is_truncate || !is_wb) && if ((is_truncate || !is_wb) &&
S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) { S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) {

14
fs/fuse/file.c
View file

@ -2330,17 +2330,17 @@ unlock:
return copied; return copied;
} }
static int fuse_launder_page(struct page *page) static int fuse_launder_folio(struct folio *folio)
{ {
int err = 0; int err = 0;
if (clear_page_dirty_for_io(page)) { if (folio_clear_dirty_for_io(folio)) {
struct inode *inode = page->mapping->host; struct inode *inode = folio->mapping->host;
/* Serialize with pending writeback for the same page */ /* Serialize with pending writeback for the same page */
fuse_wait_on_page_writeback(inode, page->index); fuse_wait_on_page_writeback(inode, folio->index);
err = fuse_writepage_locked(page); err = fuse_writepage_locked(&folio->page);
if (!err) if (!err)
fuse_wait_on_page_writeback(inode, page->index); fuse_wait_on_page_writeback(inode, folio->index);
} }
return err; return err;
} }
@ -3161,7 +3161,7 @@ static const struct address_space_operations fuse_file_aops = {
.readahead = fuse_readahead, .readahead = fuse_readahead,
.writepage = fuse_writepage, .writepage = fuse_writepage,
.writepages = fuse_writepages, .writepages = fuse_writepages,
.launder_page = fuse_launder_page, .launder_folio = fuse_launder_folio,
.set_page_dirty = __set_page_dirty_nobuffers, .set_page_dirty = __set_page_dirty_nobuffers,
.bmap = fuse_bmap, .bmap = fuse_bmap,
.direct_IO = fuse_direct_IO, .direct_IO = fuse_direct_IO,