Commit 36bdac1e authored Sep 04, 2018 by Souptick Joarder Committed by Linus Torvalds Sep 04, 2018

drivers/dax/device.c: convert variable to vm_fault_t type

As part of 226ab561 ("device-dax: Convert to vmf_insert_mixed and
vm_fault_t") in 4.19-rc1, 'rc' was not converted to vm_fault_t.  Now
converted.

Link: http://lkml.kernel.org/r/20180830153813.GA26059@jordon-HP-15-Notebook-PC


Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ross Zwisler <zwisler@kernel.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4c5d114e

drivers/dax/device.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -392,7 +392,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf,
	{		{
	struct file *filp = vmf->vma->vm_file;		struct file *filp = vmf->vma->vm_file;
	unsigned long fault_size;		unsigned long fault_size;
	int rc, id;		vm_fault_t rc = VM_FAULT_SIGBUS;
			int id;
	pfn_t pfn;		pfn_t pfn;
	struct dev_dax *dev_dax = filp->private_data;		struct dev_dax *dev_dax = filp->private_data;

Admin message