summaryrefslogtreecommitdiffstats
path: root/fs/ext2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-20 09:01:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-20 09:01:26 -0700
commit0d9cf33b4aabd8de03f80659ceae967ba2b3ba30 (patch)
tree2e3ed6e9d9e1a43742714f472480eddc313ee906 /fs/ext2
parent4d1890531413a19d63cb980fee6d9d3ff86d97ad (diff)
parent44f06ba8297c7e9dfd0e49b40cbe119113cca094 (diff)
downloadlinux-0d9cf33b4aabd8de03f80659ceae967ba2b3ba30.tar.gz
linux-0d9cf33b4aabd8de03f80659ceae967ba2b3ba30.tar.bz2
linux-0d9cf33b4aabd8de03f80659ceae967ba2b3ba30.zip
Merge tag 'for_v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
- isofs memory leak fix - two fsnotify fixes of event mask handling - udf fix of UTF-16 handling - couple other smaller cleanups * tag 'for_v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: udf: Fix leak of UTF-16 surrogates into encoded strings fs: ext2: Adding new return type vm_fault_t isofs: fix potential memory leak in mount option parsing MAINTAINERS: add an entry for FSNOTIFY infrastructure fsnotify: fix typo in a comment about mark->g_list fsnotify: fix ignore mask logic in send_to_group() isofs compress: Remove VLA usage fs: quota: Replace GFP_ATOMIC with GFP_KERNEL in dquot_init fanotify: fix logic of events on child
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 09640220fda8..047c327a6b23 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -88,11 +88,11 @@ out_unlock:
* The default page_lock and i_size verification done by non-DAX fault paths
* is sufficient because ext2 doesn't support hole punching.
*/
-static int ext2_dax_fault(struct vm_fault *vmf)
+static vm_fault_t ext2_dax_fault(struct vm_fault *vmf)
{
struct inode *inode = file_inode(vmf->vma->vm_file);
struct ext2_inode_info *ei = EXT2_I(inode);
- int ret;
+ vm_fault_t ret;
if (vmf->flags & FAULT_FLAG_WRITE) {
sb_start_pagefault(inode->i_sb);