* [PATCH 1/1] io_uring: clean up io_queue_sqe_arm_apoll
@ 2021-11-02 14:38 Pavel Begunkov
2021-11-02 15:26 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Begunkov @ 2021-11-02 14:38 UTC (permalink / raw)
To: io-uring; +Cc: Jens Axboe, Pavel Begunkov
The fix for linked timeout unprep got a bit distored with two rebases,
handle linked timeouts for IO_APOLL_READY as with all other cases, i.e.
queue it at the end of the function.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
fs/io_uring.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3ecd4b51510e..61c962c29235 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6950,10 +6950,6 @@ static void io_queue_sqe_arm_apoll(struct io_kiocb *req)
switch (io_arm_poll_handler(req)) {
case IO_APOLL_READY:
- if (linked_timeout) {
- io_queue_linked_timeout(linked_timeout);
- linked_timeout = NULL;
- }
io_req_task_queue(req);
break;
case IO_APOLL_ABORTED:
--
2.33.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] io_uring: clean up io_queue_sqe_arm_apoll
2021-11-02 14:38 [PATCH 1/1] io_uring: clean up io_queue_sqe_arm_apoll Pavel Begunkov
@ 2021-11-02 15:26 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2021-11-02 15:26 UTC (permalink / raw)
To: io-uring, Pavel Begunkov
On Tue, 2 Nov 2021 14:38:52 +0000, Pavel Begunkov wrote:
> The fix for linked timeout unprep got a bit distored with two rebases,
> handle linked timeouts for IO_APOLL_READY as with all other cases, i.e.
> queue it at the end of the function.
>
>
Applied, thanks!
[1/1] io_uring: clean up io_queue_sqe_arm_apoll
commit: 9881024aab8094a53756c7aee42564306c8e3580
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-02 15:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-02 14:38 [PATCH 1/1] io_uring: clean up io_queue_sqe_arm_apoll Pavel Begunkov
2021-11-02 15:26 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).