From d51e466e2db070e4a44655b8100acb7fa7797e13 Mon Sep 17 00:00:00 2001 From: Alexey Gladkov Date: Thu, 27 Oct 2022 14:40:58 +0300 Subject: fscache: Convert fscache_set_page_dirty() to fscache_dirty_folio() This is a subsequent backport fix that ignored fs/9p. commit 8fb72b4a76933ae6f86725cc8e4a8190ba84d755 Author: Matthew Wilcox (Oracle) Date: Wed Feb 9 20:22:01 2022 +0000 fscache: Convert fscache_set_page_dirty() to fscache_dirty_folio() Convert all users of fscache_set_page_dirty to use fscache_dirty_folio. Signed-off-by: Matthew Wilcox (Oracle) Tested-by: Damien Le Moal Acked-by: Damien Le Moal Tested-by: Mike Marshall # orangefs Tested-by: David Howells # afs Fixes: 6c04cf960a2a ("fscache: Convert fscache_set_page_dirty() to fscache_dirty_folio()") Signed-off-by: Alexey Gladkov --- fs/9p/vfs_addr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 060556f7554d..9d7a29b7ea86 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -341,11 +341,11 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping, * Mark a page as having been made dirty and thus needing writeback. We also * need to pin the cache object to write back to. */ -static int v9fs_set_page_dirty(struct page *page) +static bool v9fs_dirty_folio(struct address_space *mapping, struct folio *folio) { - struct v9fs_inode *v9inode = V9FS_I(page->mapping->host); + struct v9fs_inode *v9inode = V9FS_I(mapping->host); - return fscache_set_page_dirty(page, v9fs_inode_cookie(v9inode)); + return fscache_dirty_folio(mapping, folio, v9fs_inode_cookie(v9inode)); } #else #define v9fs_set_page_dirty __set_page_dirty_nobuffers @@ -354,7 +354,7 @@ static int v9fs_set_page_dirty(struct page *page) const struct address_space_operations v9fs_addr_operations = { .read_folio = netfs_read_folio, .readahead = netfs_readahead, - .set_page_dirty = v9fs_set_page_dirty, + .dirty_folio = v9fs_dirty_folio, .writepage = v9fs_vfs_writepage, .write_begin = v9fs_write_begin, .write_end = v9fs_write_end, -- 2.33.7