projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f00838
)
io_uring: fix wrong condition to grab uring lock
author
Hao Xu
<haoxu@linux.alibaba.com>
Thu, 14 Oct 2021 14:04:00 +0000
(22:04 +0800)
committer
Jens Axboe
<axboe@kernel.dk>
Thu, 14 Oct 2021 15:06:11 +0000
(09:06 -0600)
Grab uring lock when we are in io-worker rather than in the original
or system-wq context since we already hold it in these two situation.
Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
Fixes:
b66ceaf324b3
("io_uring: move iopoll reissue into regular IO path")
Link:
https://lore.kernel.org/r/20211014140400.50235-1-haoxu@linux.alibaba.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c
patch
|
blob
|
history
diff --git
a/fs/io_uring.c
b/fs/io_uring.c
index
6b9e702
..
e68d278
100644
(file)
--- a/
fs/io_uring.c
+++ b/
fs/io_uring.c
@@
-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);