author: Souptick Joarder <jrdr.linux@gmail.com> 2018-08-23 17:01:36 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2018-08-23 18:48:44 -0700
commit: 2b7403035459c75e193c6b04a293e518a4212de0
parent: a99237afc12ba697159ca313525dc390737dd52f
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 4 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index f649023b19b5..bfa0ec69f924 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -340,17 +340,15 @@ out:
* fatal_signal_pending()s, and the mmap_sem must be released before
* returning it.
*/
-int handle_userfault(struct vm_fault *vmf, unsigned long reason)
+vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)
{
struct mm_struct *mm = vmf->vma->vm_mm;
struct userfaultfd_ctx *ctx;
struct userfaultfd_wait_queue uwq;
- int ret;
+ vm_fault_t ret = VM_FAULT_SIGBUS;
bool must_wait, return_to_userland;
long blocking_state;
- ret = VM_FAULT_SIGBUS;
-
/*
* We don't do userfault handling for the final child pid update.
*