Commit cc0af0a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.15-2021-10-17' of git://git.kernel.dk/linux-block 

Pull io_uring fix from Jens Axboe:
 "Just a single fix for a wrong condition for grabbing a lock, a
  regression in this merge window"

* tag 'io_uring-5.15-2021-10-17' of git://git.kernel.dk/linux-block:
  io_uring: fix wrong condition to grab uring lock
parents 3bb50f85 14cfbb7a

fs/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -2949,7 +2949,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret, 
			struct io_ring_ctx *ctx = req->ctx;



			req_set_fail(req);

			if (issue_flags & IO_URING_F_NONBLOCK) {

			if (!(issue_flags & IO_URING_F_NONBLOCK)) {

				mutex_lock(&ctx->uring_lock);

				__io_req_complete(req, issue_flags, ret, cflags);

				mutex_unlock(&ctx->uring_lock);