Commit 8bf782f6 authored by Souptick Joarder's avatar Souptick Joarder Committed by Mike Marshall

orangefs: Adding new return type vm_fault_t

Use new return type vm_fault_t for fault handler. 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 the following
commit 1c8f4220 ("mm: change return type to vm_fault_t")

Fixed checkpatch.pl warning.
Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 94710cac
...@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long ar ...@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long ar
return ret; return ret;
} }
static int orangefs_fault(struct vm_fault *vmf) static vm_fault_t orangefs_fault(struct vm_fault *vmf)
{ {
struct file *file = vmf->vma->vm_file; struct file *file = vmf->vma->vm_file;
int rc; int ret;
rc = orangefs_inode_getattr(file->f_mapping->host, 0, 1,
ret = orangefs_inode_getattr(file->f_mapping->host, 0, 1,
STATX_SIZE); STATX_SIZE);
if (rc == -ESTALE) if (ret == -ESTALE)
rc = -EIO; ret = -EIO;
if (rc) { if (ret) {
gossip_err("%s: orangefs_inode_getattr failed, " gossip_err("%s: orangefs_inode_getattr failed, ret:%d:.\n",
"rc:%d:.\n", __func__, rc); __func__, ret);
return rc; return VM_FAULT_SIGBUS;
} }
return filemap_fault(vmf); return filemap_fault(vmf);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment