diff options
| author | Matthew Wilcox (Oracle) | 2022-02-09 20:21:54 +0000 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) | 2022-03-15 08:23:30 -0400 |
| commit | a42442dd73694114705a5e1a429d38457774d904 (patch) | |
| tree | e787ec5eb141fedc22e476540851d70abc8c9931 | |
| parent | 76dba927201dc07de5e679eb17bcad6d42430452 (diff) | |
afs: Convert from launder_page to launder_folio
Straightforward conversion.
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
| -rw-r--r-- | fs/afs/file.c | 2 | ||||
| -rw-r--r-- | fs/afs/internal.h | 2 | ||||
| -rw-r--r-- | fs/afs/write.c | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/fs/afs/file.c b/fs/afs/file.c index 699ea2dd01e4..56b20b922751 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -55,7 +55,7 @@ const struct address_space_operations afs_file_aops = { .readpage = afs_readpage, .readahead = afs_readahead, .set_page_dirty = afs_set_page_dirty, - .launder_page = afs_launder_page, + .launder_folio = afs_launder_folio, .releasepage = afs_releasepage, .invalidate_folio = afs_invalidate_folio, .write_begin = afs_write_begin, diff --git a/fs/afs/internal.h b/fs/afs/internal.h index b6f02321fc09..4023d8e6ab30 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -1537,7 +1537,7 @@ extern ssize_t afs_file_write(struct kiocb *, struct iov_iter *); extern int afs_fsync(struct file *, loff_t, loff_t, int); extern vm_fault_t afs_page_mkwrite(struct vm_fault *vmf); extern void afs_prune_wb_keys(struct afs_vnode *); -extern int afs_launder_page(struct page *); +int afs_launder_folio(struct folio *); /* * xattr.c diff --git a/fs/afs/write.c b/fs/afs/write.c index 5e9157d0da29..5864411bd006 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -972,9 +972,8 @@ void afs_prune_wb_keys(struct afs_vnode *vnode) /* * Clean up a page during invalidation. */ -int afs_launder_page(struct page *subpage) +int afs_launder_folio(struct folio *folio) { - struct folio *folio = page_folio(subpage); struct afs_vnode *vnode = AFS_FS_I(folio_inode(folio)); struct iov_iter iter; struct bio_vec bv[1]; @@ -982,7 +981,7 @@ int afs_launder_page(struct page *subpage) unsigned int f, t; int ret = 0; - _enter("{%lx}", folio_index(folio)); + _enter("{%lx}", folio->index); priv = (unsigned long)folio_get_private(folio); if (folio_clear_dirty_for_io(folio)) { |