diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-02-28 22:35:10 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-04-11 17:41:57 -0600 |
| commit | 2c4b8eb6435e615544b92acdcd4b25a85e83f300 (patch) | |
| tree | e8b8b1087c6f4ceb6f8b269a209a5dd335aa9373 /fs/io_uring.c | |
| parent | e83acd7d37d83035f2fe078f656f87418ea2a687 (diff) | |
| download | lwn-2c4b8eb6435e615544b92acdcd4b25a85e83f300.tar.gz lwn-2c4b8eb6435e615544b92acdcd4b25a85e83f300.zip | |
io_uring: reuse io_req_task_queue_fail()
Use io_req_task_queue_fail() on the fail path of io_req_task_queue().
It's unlikely to happen, so don't care about additional overhead, but
allows to keep all the req->result invariant in a single function.
Signed-off-by: Pavel Begunkov <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 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index db0c4b2dd141..49cdeaf710ee 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2011,25 +2011,21 @@ static void io_req_task_submit(struct callback_head *cb) __io_req_task_submit(req); } -static void io_req_task_queue(struct io_kiocb *req) +static void io_req_task_queue_fail(struct io_kiocb *req, int ret) { - int ret; + req->result = ret; + req->task_work.func = io_req_task_cancel; - req->task_work.func = io_req_task_submit; - ret = io_req_task_work_add(req); - if (unlikely(ret)) { - req->result = -ECANCELED; + if (unlikely(io_req_task_work_add(req))) io_req_task_work_add_fallback(req, io_req_task_cancel); - } } -static void io_req_task_queue_fail(struct io_kiocb *req, int ret) +static void io_req_task_queue(struct io_kiocb *req) { - req->result = ret; - req->task_work.func = io_req_task_cancel; + req->task_work.func = io_req_task_submit; if (unlikely(io_req_task_work_add(req))) - io_req_task_work_add_fallback(req, io_req_task_cancel); + io_req_task_queue_fail(req, -ECANCELED); } static inline void io_queue_next(struct io_kiocb *req) |