openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2020-05-17 13:54:12 -06:00
parent 6a4d07cde5
commit 3bfa5bcb26
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/io_uring.c
View File

@ -4470,33 +4470,32 @@ static bool __io_poll_remove_one(struct io_kiocb *req,
do_complete = true; do_complete = true;
} }
spin_unlock(&poll->head->lock); spin_unlock(&poll->head->lock);
hash_del(&req->hash_node);
return do_complete; return do_complete;
} }
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; bool do_complete;
if (req->opcode == IORING_OP_POLL_ADD) { if (req->opcode == IORING_OP_POLL_ADD) {
io_poll_remove_double(req); io_poll_remove_double(req);
do_complete = __io_poll_remove_one(req, &req->poll); do_complete = __io_poll_remove_one(req, &req->poll);
} else { } else {
apoll = req->apoll; struct async_poll *apoll = req->apoll;
/* non-poll requests have submit ref still */ /* non-poll requests have submit ref still */
do_complete = __io_poll_remove_one(req, &req->apoll->poll); do_complete = __io_poll_remove_one(req, &apoll->poll);
if (do_complete) if (do_complete) {
io_put_req(req); io_put_req(req);
} /*
* restore ->work because we will call
hash_del(&req->hash_node); * io_req_work_drop_env below when dropping the
* final reference.
if (do_complete && apoll) { */
/* memcpy(&req->work, &apoll->work, sizeof(req->work));
* restore ->work because we need to call io_req_work_drop_env. kfree(apoll);
*/ }
memcpy(&req->work, &apoll->work, sizeof(req->work));
kfree(apoll);
} }
if (do_complete) { if (do_complete) {