Commit 3eb87d4e authored Apr 16, 2018 by Souptick Joarder Committed by Greg Kroah-Hartman Apr 23, 2018

char: mspec: change return type to vm_fault_t



Use new return type vm_fault_t for the 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.

This driver failed to handle any error returned by
vm_insert_pfn. Use the new vmf_insert_pfn function
to return the correct value.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 851b4c14

drivers/char/mspec.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ mspec_close(struct vm_area_struct *vma)
		*
		* Creates a mspec page and maps it to user space.
		*/
		static int
		static vm_fault_t
		mspec_fault(struct vm_fault *vmf)
		{
		unsigned long paddr, maddr;
		@@ -223,14 +223,7 @@ mspec_fault(struct vm_fault *vmf)

		pfn = paddr >> PAGE_SHIFT;

		/*
		* vm_insert_pfn can fail with -EBUSY, but in that case it will
		* be because another thread has installed the pte first, so it
		* is no problem.
		*/
		vm_insert_pfn(vmf->vma, vmf->address, pfn);

		return VM_FAULT_NOPAGE;
		return vmf_insert_pfn(vmf->vma, vmf->address, pfn);
		}

		static const struct vm_operations_struct mspec_vm_ops = {