iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Fix up nfs_vm_page_mkwrite() for folios

Browse Source 
Mechanical conversion of struct page and functions into the folio
equivalents.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2023-01-19 16:33:46 -05:00 committed by Anna Schumaker
parent 54d99381b7
commit 4fa7a717b4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/nfs/file.c
View File

@ -556,23 +556,22 @@ const struct address_space_operations nfs_file_aops = {
*/ */
static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf) static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)
{ {
struct page *page = vmf->page;
struct file *filp = vmf->vma->vm_file; struct file *filp = vmf->vma->vm_file;
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(filp);
unsigned pagelen; unsigned pagelen;
vm_fault_t ret = VM_FAULT_NOPAGE; vm_fault_t ret = VM_FAULT_NOPAGE;
struct address_space *mapping; struct address_space *mapping;
struct folio *folio = page_folio(page); struct folio *folio = page_folio(vmf->page);
dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n", dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",
filp, filp->f_mapping->host->i_ino, filp, filp->f_mapping->host->i_ino,
(long long)page_offset(page)); (long long)folio_file_pos(folio));
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
/* make sure the cache has finished storing the page */ /* make sure the cache has finished storing the page */
if (PageFsCache(page) && if (folio_test_fscache(folio) &&
wait_on_page_fscache_killable(vmf->page) < 0) { folio_wait_fscache_killable(folio) < 0) {
ret = VM_FAULT_RETRY; ret = VM_FAULT_RETRY;
goto out; goto out;
} }
@ -581,14 +580,14 @@ static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)
nfs_wait_bit_killable, nfs_wait_bit_killable,
TASK_KILLABLE|TASK_FREEZABLE_UNSAFE); TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);
lock_page(page); folio_lock(folio);
mapping = page_file_mapping(page); mapping = folio_file_mapping(folio);
if (mapping != inode->i_mapping) if (mapping != inode->i_mapping)
goto out_unlock; goto out_unlock;
wait_on_page_writeback(page); folio_wait_writeback(folio);
pagelen = nfs_page_length(page); pagelen = nfs_folio_length(folio);
if (pagelen == 0) if (pagelen == 0)
goto out_unlock; goto out_unlock;
@ -599,7 +598,7 @@ static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)
ret = VM_FAULT_SIGBUS; ret = VM_FAULT_SIGBUS;
out_unlock: out_unlock:
unlock_page(page); folio_unlock(folio);
out: out:
sb_end_pagefault(inode->i_sb); sb_end_pagefault(inode->i_sb);
return ret; return ret;