diff --git a/Makefile b/Makefile index 89e039ab5968..b17ce4c2e8f2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 15 -SUBLEVEL = 97 +SUBLEVEL = 98 EXTRAVERSION = NAME = Trick or Treat
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 7857b3d9d6a7..51d6fbe17f7f 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -7310,7 +7310,8 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
if (io_op_defs[req->opcode].needs_file) { req->file = io_file_get(ctx, req, READ_ONCE(sqe->fd), - (sqe_flags & IOSQE_FIXED_FILE), 0); + (sqe_flags & IOSQE_FIXED_FILE), + IO_URING_F_NONBLOCK); if (unlikely(!req->file)) ret = -EBADF; }