projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e08102d
)
io_uring: don't adjust LINK_HEAD in cancel ltimeout
author
Pavel Begunkov
<asml.silence@gmail.com>
Thu, 22 Oct 2020 15:43:09 +0000
(16:43 +0100)
committer
Jens Axboe
<axboe@kernel.dk>
Fri, 23 Oct 2020 19:07:11 +0000
(13:07 -0600)
An armed linked timeout can never be a head of a link, so we don't need
to clear REQ_F_LINK_HEAD for it.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.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
db7ad9e
..
0436529
100644
(file)
--- a/
fs/io_uring.c
+++ b/
fs/io_uring.c
@@
-1856,7
+1856,6
@@
static bool io_link_cancel_timeout(struct io_kiocb *req)
if (ret != -1) {
io_cqring_fill_event(req, -ECANCELED);
io_commit_cqring(ctx);
- req->flags &= ~REQ_F_LINK_HEAD;
io_put_req_deferred(req, 1);
return true;
}