dax: check return value of dax_radix_entry()
dax_pfn_mkwrite() previously wasn't checking the return value of the call to dax_radix_entry(), which was a mistake. Instead, capture this return value and return the appropriate VM_FAULT_ value. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Matthew Wilcox <willy@linux.intel.com> Cc: Dave Chinner <david@fromorbit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
566e8dfd88
Коммит
30f471fd88
9
fs/dax.c
9
fs/dax.c
|
@ -1056,6 +1056,7 @@ EXPORT_SYMBOL_GPL(dax_pmd_fault);
|
||||||
int dax_pfn_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
|
int dax_pfn_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||||
{
|
{
|
||||||
struct file *file = vma->vm_file;
|
struct file *file = vma->vm_file;
|
||||||
|
int error;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We pass NO_SECTOR to dax_radix_entry() because we expect that a
|
* We pass NO_SECTOR to dax_radix_entry() because we expect that a
|
||||||
|
@ -1065,7 +1066,13 @@ int dax_pfn_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||||
* saves us from having to make a call to get_block() here to look
|
* saves us from having to make a call to get_block() here to look
|
||||||
* up the sector.
|
* up the sector.
|
||||||
*/
|
*/
|
||||||
dax_radix_entry(file->f_mapping, vmf->pgoff, NO_SECTOR, false, true);
|
error = dax_radix_entry(file->f_mapping, vmf->pgoff, NO_SECTOR, false,
|
||||||
|
true);
|
||||||
|
|
||||||
|
if (error == -ENOMEM)
|
||||||
|
return VM_FAULT_OOM;
|
||||||
|
if (error)
|
||||||
|
return VM_FAULT_SIGBUS;
|
||||||
return VM_FAULT_NOPAGE;
|
return VM_FAULT_NOPAGE;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(dax_pfn_mkwrite);
|
EXPORT_SYMBOL_GPL(dax_pfn_mkwrite);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче