mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
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 1c8f422059
("mm: change return type to vm_fault_t")
Fixed checkpatch.pl warning.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
parent
94710cac0e
commit
8bf782f647
1 changed files with 10 additions and 9 deletions
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue