commit 9d8bd6fcf0ebfccf39e6ac44df3c41155481030e Merge: c0007c4f36a7 61cd83d3ade6 Author: Jens Axboe Date: Mon Jan 27 12:50:20 2020 -0700 Merge branch 'for-5.6/io_uring-vfs' into ll * for-5.6/io_uring-vfs: (58 commits) io_uring: fix refcounting with batched allocations at OOM io_uring: add comment for drain_next io_uring: don't attempt to copy iovec for READ/WRITE io_uring: add support for sharing kernel io-wq workqueue io-wq: allow lookup of existing io_wq with given id io-wq: add 'id' to io_wq io-wq: make the io_wq ref counted io_uring: honor IOSQE_ASYNC for linked reqs io_uring: prep req when do IOSQE_ASYNC io_uring: use labeled array init in io_op_defs io_uring: optimise sqe-to-req flags translation io_uring: remove REQ_F_IO_DRAINED io_uring: file switch work needs to get flushed on exit io_uring: hide uring_fd in ctx io_uring: remove extra check in __io_commit_cqring io_uring: optimise use of ctx->drain_next io_uring: add support for probing opcodes io_uring: account fixed file references correctly in batch io_uring: add opcode to issue trace event io_uring: add support for IORING_OP_OPENAT2 ... Signed-off-by: Jens Axboe diff --cc fs/io_uring.c index e54556b0fcc6,65fe16a795c1..eeaafbd74259 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@@ -5157,7 -6312,12 +6308,6 @@@ SYSCALL_DEFINE6(io_uring_enter, unsigne } else if (to_submit) { struct mm_struct *cur_mm; - to_submit = min(to_submit, ctx->sq_entries); - if (current->mm != ctx->sqo_mm || - current_cred() != ctx->creds) { - ret = -EPERM; - goto out; - } - mutex_lock(&ctx->uring_lock); /* already have mm, so io_submit_sqes() won't try to grab it */ cur_mm = ctx->sqo_mm;