Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

io_uring: refactor io_poll_complete()

Browse Source 
Remove error parameter from io_poll_complete(), 0 is always passed,
and do a bit of cleaning on top.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-04-09 09:13:20 +01:00 committed by Jens Axboe
parent f40b964a66
commit e27414bef7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/io_uring.c
View File

@ -4894,18 +4894,19 @@ static void io_poll_remove_double(struct io_kiocb *req)
}
}
static bool io_poll_complete(struct io_kiocb *req, __poll_t mask, int error)
static bool io_poll_complete(struct io_kiocb *req, __poll_t mask)
__must_hold(&req->ctx->completion_lock)
{
struct io_ring_ctx *ctx = req->ctx;
unsigned flags = IORING_CQE_F_MORE;
int error;
if (!error && req->poll.canceled) {
if (READ_ONCE(req->poll.canceled)) {
error = -ECANCELED;
req->poll.events |= EPOLLONESHOT;
}
if (!error)
} else {
error = mangle_poll(mask);
}
if (req->poll.events & EPOLLONESHOT)
flags = 0;
if (!__io_cqring_fill_event(req, error, flags)) {
@ -4928,7 +4929,7 @@ static void io_poll_task_func(struct callback_head *cb)
} else {
bool done;
done = io_poll_complete(req, req->result, 0);
done = io_poll_complete(req, req->result);
if (done) {
hash_del(&req->hash_node);
} else {
@ -5414,7 +5415,7 @@ static int __io_poll_add(struct io_kiocb *req)
if (mask) { /* no async, we'd stolen it */
ipt.error = 0;
io_poll_complete(req, mask, 0);
io_poll_complete(req, mask);
}
spin_unlock_irq(&ctx->completion_lock);