diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2021-04-13 02:58:43 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-04-13 09:37:55 -0600 |
| commit | e31001a3abb81a2dba976b842b8ab65d123bca2a (patch) | |
| tree | ef6b8b37fe9097d466fa305f1c4ffdad1de0d14f | |
| parent | io_uring: refactor hrtimer_try_to_cancel uses (diff) | |
io_uring: clean up io_poll_remove_waitqs()
Move some parts of io_poll_remove_waitqs() that are opcode independent.
Looks better and stresses that both do __io_poll_remove_one().
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/bbc717f82117cc335c89cbe67ec8d72608178732.1618278933.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 158ad55a6c14..1627d69a570c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5219,21 +5219,16 @@ static bool io_poll_remove_waitqs(struct io_kiocb *req) bool do_complete; io_poll_remove_double(req); + do_complete = __io_poll_remove_one(req, io_poll_get_single(req), true); - if (req->opcode == IORING_OP_POLL_ADD) { - do_complete = __io_poll_remove_one(req, &req->poll, true); - } else { + if (req->opcode != IORING_OP_POLL_ADD && do_complete) { struct async_poll *apoll = req->apoll; /* non-poll requests have submit ref still */ - do_complete = __io_poll_remove_one(req, &apoll->poll, true); - if (do_complete) { - req_ref_put(req); - kfree(apoll->double_poll); - kfree(apoll); - } + req_ref_put(req); + kfree(apoll->double_poll); + kfree(apoll); } - return do_complete; } |