diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-01-24 23:08:54 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-27 15:36:29 -0700 |
| commit | 980ad26304abf11e78caaa68023411b9c088b848 (patch) | |
| tree | 1a89d63d7906abb3d9313fa1becd40d8329a071f /fs | |
| parent | 86a761f81ec87a96572214f5db606f60d36aaf08 (diff) | |
| download | linux-980ad26304abf11e78caaa68023411b9c088b848.tar.bz2 | |
io_uring: don't attempt to copy iovec for READ/WRITE
For the non-vectored variant of READV/WRITEV, we don't need to setup an
async io context, and we flag that appropriately in the io_op_defs
array. However, in fixing this for the 5.5 kernel in commit 74566df3a71c
we didn't have these opcodes, so the check there was added just for the
READ_FIXED and WRITE_FIXED opcodes. Replace that check with just a
single check for needing async context, that covers all four of these
read/write variants that don't use an iovec.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 9f73586dcfb8..4bde5da2c2f5 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2112,8 +2112,7 @@ static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size, struct iovec *iovec, struct iovec *fast_iov, struct iov_iter *iter) { - if (req->opcode == IORING_OP_READ_FIXED || - req->opcode == IORING_OP_WRITE_FIXED) + if (!io_op_defs[req->opcode].async_ctx) return 0; if (!req->io && io_alloc_async_ctx(req)) return -ENOMEM; |