tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds cc0af0a9 3bb50f85

+1 -1
+1 -1
fs/io_uring.c
··· 2949 2949 struct io_ring_ctx *ctx = req->ctx; 2950 2950 2951 2951 req_set_fail(req); 2952 - if (issue_flags & IO_URING_F_NONBLOCK) { 2952 + if (!(issue_flags & IO_URING_F_NONBLOCK)) { 2953 2953 mutex_lock(&ctx->uring_lock); 2954 2954 __io_req_complete(req, issue_flags, ret, cflags); 2955 2955 mutex_unlock(&ctx->uring_lock);