Commit 2bf06b8e authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fuse: Convert from launder_page to launder_folio 



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

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs
parent ff2b48b9

fs/fuse/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1773,7 +1773,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, 


	/*

	 * 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) &&

	    S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) {

fs/fuse/file.c

+7 −7
Original line number Diff line number Diff line
@@ -2330,17 +2330,17 @@ static int fuse_write_end(struct file *file, struct address_space *mapping, 
	return copied;

}



static int fuse_launder_page(struct page *page)

static int fuse_launder_folio(struct folio *folio)

{

	int err = 0;

	if (clear_page_dirty_for_io(page)) {

		struct inode *inode = page->mapping->host;

	if (folio_clear_dirty_for_io(folio)) {

		struct inode *inode = folio->mapping->host;



		/* Serialize with pending writeback for the same page */

		fuse_wait_on_page_writeback(inode, page->index);

		err = fuse_writepage_locked(page);

		fuse_wait_on_page_writeback(inode, folio->index);

		err = fuse_writepage_locked(&folio->page);

		if (!err)

			fuse_wait_on_page_writeback(inode, page->index);

			fuse_wait_on_page_writeback(inode, folio->index);

	}

	return err;

}
@@ -3161,7 +3161,7 @@ static const struct address_space_operations fuse_file_aops = { 
	.readahead	= fuse_readahead,

	.writepage	= fuse_writepage,

	.writepages	= fuse_writepages,

	.launder_page	= fuse_launder_page,

	.launder_folio	= fuse_launder_folio,

	.set_page_dirty	= __set_page_dirty_nobuffers,

	.bmap		= fuse_bmap,

	.direct_IO	= fuse_direct_IO,