Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a36844 authored by Souptick Joarder's avatar Souptick Joarder Committed by Anna Schumaker
Browse files

fs: nfs: Adding new return type vm_fault_t 



Use new return type vm_fault_t for fault handler
in struct vm_operations_struct. For now, this is
just documenting that the function returns a
VM_FAULT value rather than an errno.  Once all
instances are converted, vm_fault_t will become
a distinct type.

see commit 1c8f4220 ("mm: change return type to
vm_fault_t") for reference.

Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 12b289cf

fs/nfs/file.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -532,13 +532,13 @@ const struct address_space_operations nfs_file_aops = { 
 * writable, implying that someone is about to modify the page through a

 * writable, implying that someone is about to modify the page through a

 * shared-writable mapping

 * shared-writable mapping

 */

 */

static int 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 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;

	int ret = VM_FAULT_NOPAGE;

	vm_fault_t ret = VM_FAULT_NOPAGE;

	struct address_space *mapping;

	struct address_space *mapping;





	dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",

	dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",