Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 05:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: inline io_import_iovec()

Browse Source 
Inline io_import_iovec() and leave only its former __io_import_iovec()
renamed to the original name. That makes it more obious what is reused in
io_read/write().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2020-11-07 13:16:27 +00:00 committed by Jens Axboe
parent 632546c4b5
commit 2846c481c9
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fs/io_uring.c
View File

@ -3150,7 +3150,7 @@ static ssize_t io_iov_buffer_select(struct io_kiocb *req, struct iovec *iov,
return __io_iov_buffer_select(req, iov, needs_lock); return __io_iov_buffer_select(req, iov, needs_lock);
} }
static ssize_t __io_import_iovec(int rw, struct io_kiocb *req, static ssize_t io_import_iovec(int rw, struct io_kiocb *req,
struct iovec **iovec, struct iov_iter *iter, struct iovec **iovec, struct iov_iter *iter,
bool needs_lock) bool needs_lock)
{ {
@ -3196,18 +3196,6 @@ static ssize_t __io_import_iovec(int rw, struct io_kiocb *req,
req->ctx->compat); req->ctx->compat);
} }
static ssize_t io_import_iovec(int rw, struct io_kiocb *req,
struct iovec **iovec, struct iov_iter *iter,
bool needs_lock)
{
struct io_async_rw *iorw = req->async_data;
if (!iorw)
return __io_import_iovec(rw, req, iovec, iter, needs_lock);
*iovec = NULL;
return 0;
}
static inline loff_t *io_kiocb_ppos(struct kiocb *kiocb) static inline loff_t *io_kiocb_ppos(struct kiocb *kiocb)
{ {
return (kiocb->ki_filp->f_mode & FMODE_STREAM) ? NULL : &kiocb->ki_pos; return (kiocb->ki_filp->f_mode & FMODE_STREAM) ? NULL : &kiocb->ki_pos;
@ -3331,7 +3319,7 @@ static inline int io_rw_prep_async(struct io_kiocb *req, int rw)
struct iovec *iov = iorw->fast_iov; struct iovec *iov = iorw->fast_iov;
ssize_t ret; ssize_t ret;
ret = __io_import_iovec(rw, req, &iov, &iorw->iter, false); ret = io_import_iovec(rw, req, &iov, &iorw->iter, false);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
return ret; return ret;
@ -3466,12 +3454,14 @@ static int io_read(struct io_kiocb *req, bool force_nonblock,
ssize_t io_size, ret, ret2; ssize_t io_size, ret, ret2;
bool no_async; bool no_async;
if (rw) if (rw) {
iter = &rw->iter; iter = &rw->iter;
iovec = NULL;
ret = io_import_iovec(READ, req, &iovec, iter, !force_nonblock); } else {
if (ret < 0) ret = io_import_iovec(READ, req, &iovec, iter, !force_nonblock);
return ret; if (ret < 0)
return ret;
}
io_size = iov_iter_count(iter); io_size = iov_iter_count(iter);
req->result = io_size; req->result = io_size;
ret = 0; ret = 0;
@ -3592,12 +3582,14 @@ static int io_write(struct io_kiocb *req, bool force_nonblock,
struct io_async_rw *rw = req->async_data; struct io_async_rw *rw = req->async_data;
ssize_t ret, ret2, io_size; ssize_t ret, ret2, io_size;
if (rw) if (rw) {
iter = &rw->iter; iter = &rw->iter;
iovec = NULL;
ret = io_import_iovec(WRITE, req, &iovec, iter, !force_nonblock); } else {
if (ret < 0) ret = io_import_iovec(WRITE, req, &iovec, iter, !force_nonblock);
return ret; if (ret < 0)
return ret;
}
io_size = iov_iter_count(iter); io_size = iov_iter_count(iter);
req->result = io_size; req->result = io_size;