diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-04-13 02:58:42 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-04-13 09:37:55 -0600 |
| commit | fd9c7bc542dae7cca3b02c77f7863823d54ddee0 (patch) | |
| tree | e882af07dff2d3720f90afc10aaaf6d85543205e /fs/io_uring.c | |
| parent | 8c855885b8b35af24f45cdd288a9b6ba6274a8ac (diff) | |
| download | lwn-fd9c7bc542dae7cca3b02c77f7863823d54ddee0.tar.gz lwn-fd9c7bc542dae7cca3b02c77f7863823d54ddee0.zip | |
io_uring: refactor hrtimer_try_to_cancel uses
Don't save return values of hrtimer_try_to_cancel() in a variable, but
use right away. It's in general safer to not have an intermediate
variable, which may be reused and passed out wrongly, but it be
contracted out. Also clean io_timeout_extract().
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/d2566ef7ce632e6882dc13e022a26249b3fd30b5.1618278933.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 640e26bf3f4f..158ad55a6c14 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1270,10 +1270,8 @@ static void io_kill_timeout(struct io_kiocb *req, int status) __must_hold(&req->ctx->completion_lock) { struct io_timeout_data *io = req->async_data; - int ret; - ret = hrtimer_try_to_cancel(&io->timer); - if (ret != -1) { + if (hrtimer_try_to_cancel(&io->timer) != -1) { atomic_set(&req->ctx->cq_timeouts, atomic_read(&req->ctx->cq_timeouts) + 1); list_del_init(&req->timeout.list); @@ -1790,12 +1788,10 @@ static bool io_kill_linked_timeout(struct io_kiocb *req) */ if (link && (link->flags & REQ_F_LTIMEOUT_ACTIVE)) { struct io_timeout_data *io = link->async_data; - int ret; io_remove_next_linked(req); link->timeout.head = NULL; - ret = hrtimer_try_to_cancel(&io->timer); - if (ret != -1) { + if (hrtimer_try_to_cancel(&io->timer) != -1) { io_cqring_fill_event(link, -ECANCELED, 0); io_put_req_deferred(link, 1); return true; @@ -5528,21 +5524,18 @@ static struct io_kiocb *io_timeout_extract(struct io_ring_ctx *ctx, { struct io_timeout_data *io; struct io_kiocb *req; - int ret = -ENOENT; + bool found = false; list_for_each_entry(req, &ctx->timeout_list, timeout.list) { - if (user_data == req->user_data) { - ret = 0; + found = user_data == req->user_data; + if (found) break; - } } - - if (ret == -ENOENT) - return ERR_PTR(ret); + if (!found) + return ERR_PTR(-ENOENT); io = req->async_data; - ret = hrtimer_try_to_cancel(&io->timer); - if (ret == -1) + if (hrtimer_try_to_cancel(&io->timer) == -1) return ERR_PTR(-EALREADY); list_del_init(&req->timeout.list); return req; |