diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-11-23 00:07:46 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-11-23 12:24:20 -0700 |
| commit | 06bdea20c1076471f7ab7d3ad7f35cbcbd59a8e3 (patch) | |
| tree | 1109cd687347c4a025d13fae994ea41d6a599326 /fs/io_uring.c | |
| parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
| download | linux-stable-06bdea20c1076471f7ab7d3ad7f35cbcbd59a8e3.tar.gz linux-stable-06bdea20c1076471f7ab7d3ad7f35cbcbd59a8e3.tar.bz2 linux-stable-06bdea20c1076471f7ab7d3ad7f35cbcbd59a8e3.zip | |
io_uring: simplify reissue in kiocb_done
Simplify failed resubmission prep in kiocb_done(), it's a bit ugly with
conditional logic and hand handling cflags / select buffers. Instead,
punt to tw and use io_req_task_complete() already handling all the
cases.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/667c33484b05b612e9420e1b1d5f4dc46d0ee9ce.1637524285.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 | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index b07196b4511c..8b7b30835c72 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2948,17 +2948,10 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret, if (io_resubmit_prep(req)) { io_req_task_queue_reissue(req); } else { - unsigned int cflags = io_put_rw_kbuf(req); - struct io_ring_ctx *ctx = req->ctx; - req_set_fail(req); - if (issue_flags & IO_URING_F_UNLOCKED) { - mutex_lock(&ctx->uring_lock); - __io_req_complete(req, issue_flags, ret, cflags); - mutex_unlock(&ctx->uring_lock); - } else { - __io_req_complete(req, issue_flags, ret, cflags); - } + req->result = ret; + req->io_task_work.func = io_req_task_complete; + io_req_task_work_add(req); } } } |