| Message ID | 20180830153813.GA26059@jordon-HP-15-Notebook-PC (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | device-dax: Convert variable to vm_fault_t type | expand |
On Thu, Aug 30, 2018 at 9:05 PM Souptick Joarder <jrdr.linux@gmail.com> wrote: > > As part of commit 226ab561075f ("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. > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> Sorry, I missed this initially. > --- > drivers/dax/device.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/dax/device.c b/drivers/dax/device.c > index 6fd4608..bbe4d72 100644 > --- a/drivers/dax/device.c > +++ b/drivers/dax/device.c > @@ -392,7 +392,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, > { > struct file *filp = vmf->vma->vm_file; > unsigned long fault_size; > - int rc, id; > + vm_fault_t rc = VM_FAULT_SIGBUS; > + int id; > pfn_t pfn; > struct dev_dax *dev_dax = filp->private_data; > > -- > 1.9.1 >
diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 6fd4608..bbe4d72 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -392,7 +392,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, { struct file *filp = vmf->vma->vm_file; unsigned long fault_size; - int rc, id; + vm_fault_t rc = VM_FAULT_SIGBUS; + int id; pfn_t pfn; struct dev_dax *dev_dax = filp->private_data;
As part of commit 226ab561075f ("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. Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> --- drivers/dax/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)