author: Peter Xu <peterx@redhat.com> 2020-04-01 21:08:41 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-04-02 09:35:30 -0700
commit: c270a7eedcf278304e05ebd2c96807487c97db61
parent: dde1607248328cdb7570e3a252e8fb76b3411d66
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 3 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 888272621f38..c076d3295958 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -462,9 +462,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)
uwq.ctx = ctx;
uwq.waken = false;
- return_to_userland =
- (vmf->flags & (FAULT_FLAG_USER|FAULT_FLAG_KILLABLE)) ==
- (FAULT_FLAG_USER|FAULT_FLAG_KILLABLE);
+ return_to_userland = vmf->flags & FAULT_FLAG_INTERRUPTIBLE;
blocking_state = return_to_userland ? TASK_INTERRUPTIBLE :
TASK_KILLABLE;