io_uring: remove double poll wait entry for pure poll
PATCH 1/1 io_uring: remove double poll wait entry for pure poll
For pure poll requests, we should remove the double poll wait entry. And io_poll_remove_double() is good enough for it compared with io_poll_remove_waitqs().
Signed-off-by Hao Xu <[email protected]>
--- fs/io_uring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/io_uring.c +2 -2
@@ -4903,7 +4903,6 @@ static bool io_poll_complete(struct io_kiocb *req, __poll_t mask)if (req->poll.events &EPOLLONESHOT ) flags =0 ;if (!io_cqring_fill_event (ctx, req->user_data, error, flags)) { -io_poll_remove_waitqs (req); req->poll.done = true; flags =0 ; }
@@ -4926,6 +4925,7 @@ static void io_poll_task_func(struct io_kiocb *req) done =io_poll_complete (req, req->result);if (done) { +io_poll_remove_double (req);hash_del (&req->hash_node); }else { req->result =0 ;
@@ -5113,7 +5113,7 @@ static __poll_t __io_arm_poll_handler(struct io_kiocb *req, ipt->error = -EINVAL ;spin_lock_irq (&ctx->completion_lock); -if (ipt->error) +if (ipt->error || (mask && (poll->events &EPOLLONESHOT )))io_poll_remove_double (req);if (likely (poll->head)) {spin_lock (&poll->head->lock);
Signature · 1 line
2.24.4