io_uring: cleanup io_poll_remove_one() logic
Jens Axboe
maintainerPATCH 1/1 io_uring: cleanup io_poll_remove_one() logic
We only need apoll in the one section, do the juggling with the work restoration there. This removes a special case further down as well.
No functional changes in this patch.
Signed-off-by Jens Axboe <[email protected]>
--- fs/io_uring.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
fs/io_uring.c +11 -12
@@ -4476,30 +4476,29 @@ static bool __io_poll_remove_one(struct io_kiocb *req,static bool io_poll_remove_one (struct io_kiocb *req) { -struct async_poll *apoll =NULL ;bool do_complete;if (req->opcode ==IORING_OP_POLL_ADD ) {io_poll_remove_double (req); do_complete =__io_poll_remove_one (req, &req->poll); }else { - apoll = req->apoll; +struct async_poll *apoll = req->apoll; +/* non-poll requests have submit ref still */ - do_complete =__io_poll_remove_one (req, &req->apoll->poll); -if (do_complete) + do_complete =__io_poll_remove_one (req, &apoll->poll); +if (do_complete) {io_put_req (req); +/* +* restore ->work because we will call +* io_req_work_drop_env below when dropping the +* final reference. +*/ +memcpy (&req->work, &apoll->work,sizeof (req->work)); +kfree (apoll); }hash_del (&req->hash_node); -if (do_complete && apoll) { -/* -* restore ->work because we need to call io_req_work_drop_env. -*/ -memcpy (&req->work, &apoll->work,sizeof (req->work)); -kfree (apoll); - } -if (do_complete) {io_cqring_fill_event (req, -ECANCELED );io_commit_cqring (req->ctx);
Signature · 4 lines
2.26.2 -- Jens Axboe