diff options
| author | Souptick Joarder <jrdr.linux@gmail.com> | 2018-05-13 22:01:49 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-05-13 22:01:49 +0200 |
| commit | 71fe989961374ae55863c5da527bcf45be020834 (patch) | |
| tree | f8b6f56c9ffd89d5a4fa0143396639cc447c3f34 /fs/ext4/file.c | |
| parent | ext4: fix hole length detection in ext4_ind_map_blocks() (diff) | |
| download | linux-71fe989961374ae55863c5da527bcf45be020834.tar.xz linux-71fe989961374ae55863c5da527bcf45be020834.zip | |
fs: ext4: add 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.
commit 1c8f422059ae ("mm: change return type to vm_fault_t")
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Diffstat (limited to 'fs/ext4/file.c')
| -rw-r--r-- | fs/ext4/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index fb6f023622fe..655d1c7bc614 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -277,10 +277,11 @@ out: } #ifdef CONFIG_FS_DAX -static int ext4_dax_huge_fault(struct vm_fault *vmf, +static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf, enum page_entry_size pe_size) { - int result, error = 0; + int error = 0; + vm_fault_t result; int retries = 0; handle_t *handle = NULL; struct inode *inode = file_inode(vmf->vma->vm_file); @@ -335,7 +336,7 @@ retry: return result; } -static int ext4_dax_fault(struct vm_fault *vmf) +static vm_fault_t ext4_dax_fault(struct vm_fault *vmf) { return ext4_dax_huge_fault(vmf, PE_SIZE_PTE); } |