Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 15:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

io_uring: refactor io_resubmit_prep()

Browse Source 
It's awkward to pass return a value into a function for it to return it
back. Check it at the caller site and clean up io_resubmit_prep() a bit.

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-01-19 13:32:35 +00:00 committed by Jens Axboe
parent bf6182b6d4
commit dc2a6e9aa9
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fs/io_uring.c
View File

@ -2689,17 +2689,16 @@ static void io_complete_rw_common(struct kiocb *kiocb, long res,
} }
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
static bool io_resubmit_prep(struct io_kiocb *req, int error) static bool io_resubmit_prep(struct io_kiocb *req)
{ {
struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs; struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
ssize_t ret = -ECANCELED; ssize_t ret = -ECANCELED;
struct iov_iter iter; struct iov_iter iter;
int rw; int rw;
if (error) { /* already prepared */
ret = error; if (req->async_data)
goto end_req; return true;
}
switch (req->opcode) { switch (req->opcode) {
case IORING_OP_READV: case IORING_OP_READV:
@ -2715,22 +2714,16 @@ static bool io_resubmit_prep(struct io_kiocb *req, int error)
default: default:
printk_once(KERN_WARNING "io_uring: bad opcode in resubmit %d\n", printk_once(KERN_WARNING "io_uring: bad opcode in resubmit %d\n",
req->opcode); req->opcode);
goto end_req; return false;
} }
if (!req->async_data) { ret = io_import_iovec(rw, req, &iovec, &iter, false);
ret = io_import_iovec(rw, req, &iovec, &iter, false); if (ret < 0)
if (ret < 0) return false;
goto end_req; ret = io_setup_async_rw(req, iovec, inline_vecs, &iter, false);
ret = io_setup_async_rw(req, iovec, inline_vecs, &iter, false); if (!ret)
if (!ret)
return true;
kfree(iovec);
} else {
return true; return true;
} kfree(iovec);
end_req:
req_set_fail_links(req);
return false; return false;
} }
#endif #endif
@ -2751,12 +2744,12 @@ static bool io_rw_reissue(struct io_kiocb *req, long res)
ret = io_sq_thread_acquire_mm_files(req->ctx, req); ret = io_sq_thread_acquire_mm_files(req->ctx, req);
if (io_resubmit_prep(req, ret)) { if (!ret && io_resubmit_prep(req)) {
refcount_inc(&req->refs); refcount_inc(&req->refs);
io_queue_async_work(req); io_queue_async_work(req);
return true; return true;
} }
req_set_fail_links(req);
#endif #endif
return false; return false;
} }