Skip to content

Commit cc0af0a

Browse files
committed
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
2 parents 3bb50f8 + 14cfbb7 commit cc0af0a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/io_uring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2949,7 +2949,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
29492949
struct io_ring_ctx *ctx = req->ctx;
29502950

29512951
req_set_fail(req);
2952-
if (issue_flags & IO_URING_F_NONBLOCK) {
2952+
if (!(issue_flags & IO_URING_F_NONBLOCK)) {
29532953
mutex_lock(&ctx->uring_lock);
29542954
__io_req_complete(req, issue_flags, ret, cflags);
29552955
mutex_unlock(&ctx->uring_lock);

0 commit comments

Comments
 (0)