Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71fe9899 authored by Souptick Joarder's avatar Souptick Joarder Committed by Theodore Ts'o
Browse files

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 1c8f4220 ("mm: change return type to vm_fault_t")

Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
parent 2ee3ee06

fs/ext4/file.c

+4 −3
Original line number Diff line number Diff line
@@ -277,10 +277,11 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
}



#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 @@ static int ext4_dax_huge_fault(struct vm_fault *vmf, 
	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);

}