aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

nfs: Convert from invalidatepage to invalidate_folio

Browse Source 
Print the folio index instead of the pointer, since this is more
useful.  We also don't need to use page_file_mapping() as we do not
invalidate swapcache pages.  Since this is the only caller of
nfs_wb_page_cancel(), convert it to nfs_wb_folio_cancel().

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:47 +00:00
parent c5b56b50d7
commit 6d740c76ea
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfs/file.c
View File

@@ -406,17 +406,17 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
* - Called if either PG_private or PG_fscache is set on the page * - Called if either PG_private or PG_fscache is set on the page
* - Caller holds page lock * - Caller holds page lock
*/ */
static void nfs_invalidate_page(struct page *page, unsigned int offset, static void nfs_invalidate_folio(struct folio *folio, size_t offset,
unsigned int length) size_t length)
{ {
dfprintk(PAGECACHE, "NFS: invalidate_page(%p, %u, %u)\n", dfprintk(PAGECACHE, "NFS: invalidate_folio(%lu, %zu, %zu)\n",
page, offset, length); folio->index, offset, length);
if (offset != 0 || length < PAGE_SIZE) if (offset != 0 || length < folio_size(folio))
return; return;
/* Cancel any unstarted writes on this page */ /* Cancel any unstarted writes on this page */
nfs_wb_page_cancel(page_file_mapping(page)->host, page); nfs_wb_folio_cancel(folio->mapping->host, folio);
wait_on_page_fscache(page); folio_wait_fscache(folio);
} }
/* /*
@@ -520,7 +520,7 @@ const struct address_space_operations nfs_file_aops = {
.writepages = nfs_writepages, .writepages = nfs_writepages,
.write_begin = nfs_write_begin, .write_begin = nfs_write_begin,
.write_end = nfs_write_end, .write_end = nfs_write_end,
.invalidatepage = nfs_invalidate_page, .invalidate_folio = nfs_invalidate_folio,
.releasepage = nfs_release_page, .releasepage = nfs_release_page,
.direct_IO = nfs_direct_IO, .direct_IO = nfs_direct_IO,
#ifdef CONFIG_MIGRATION #ifdef CONFIG_MIGRATION

8
fs/nfs/write.c
View File

@@ -2049,21 +2049,21 @@ out:
} }
EXPORT_SYMBOL_GPL(nfs_wb_all); EXPORT_SYMBOL_GPL(nfs_wb_all);
int nfs_wb_page_cancel(struct inode *inode, struct page *page) int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio)
{ {
struct nfs_page *req; struct nfs_page *req;
int ret = 0; int ret = 0;
wait_on_page_writeback(page); folio_wait_writeback(folio);
/* blocking call to cancel all requests and join to a single (head) /* blocking call to cancel all requests and join to a single (head)
* request */ * request */
req = nfs_lock_and_join_requests(page); req = nfs_lock_and_join_requests(&folio->page);
if (IS_ERR(req)) { if (IS_ERR(req)) {
ret = PTR_ERR(req); ret = PTR_ERR(req);
} else if (req) { } else if (req) {
/* all requests from this page have been cancelled by /* all requests from this folio have been cancelled by
* nfs_lock_and_join_requests, so just remove the head * nfs_lock_and_join_requests, so just remove the head
* request from the inode / page_private pointer and * request from the inode / page_private pointer and
* release it */ * release it */

2
include/linux/nfs_fs.h
View File

@@ -583,7 +583,7 @@ extern int nfs_updatepage(struct file *, struct page *, unsigned int, unsigned
extern int nfs_sync_inode(struct inode *inode); extern int nfs_sync_inode(struct inode *inode);
extern int nfs_wb_all(struct inode *inode); extern int nfs_wb_all(struct inode *inode);
extern int nfs_wb_page(struct inode *inode, struct page *page); extern int nfs_wb_page(struct inode *inode, struct page *page);
extern int nfs_wb_page_cancel(struct inode *inode, struct page* page); int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio);
extern int nfs_commit_inode(struct inode *, int); extern int nfs_commit_inode(struct inode *, int);
extern struct nfs_commit_data *nfs_commitdata_alloc(bool never_fail); extern struct nfs_commit_data *nfs_commitdata_alloc(bool never_fail);
extern void nfs_commit_free(struct nfs_commit_data *data); extern void nfs_commit_free(struct nfs_commit_data *data);