diff options
| author | David Laight <David.Laight@ACULAB.COM> | 2020-11-07 13:16:25 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-12-09 12:04:00 -0700 |
| commit | 10fc72e43352753a08f9cf83aa5c40baec00d212 (patch) | |
| tree | 2340ea5259e6dd6b3d3612dbdc2331b11e68b04d | |
| parent | 1a38ffc9cbca361cc274d6e234f5ef8922f0b6d9 (diff) | |
| download | lwn-10fc72e43352753a08f9cf83aa5c40baec00d212.tar.gz lwn-10fc72e43352753a08f9cf83aa5c40baec00d212.zip | |
fs/io_uring Don't use the return value from import_iovec().
This is the only code that relies on import_iovec() returning
iter.count on success.
This allows a better interface to import_iovec().
Signed-off-by: David Laight <david.laight@aculab.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 775a83ebc8ab..c1ac352e3e15 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3179,7 +3179,7 @@ static ssize_t __io_import_iovec(int rw, struct io_kiocb *req, ret = import_single_range(rw, buf, sqe_len, *iovec, iter); *iovec = NULL; - return ret < 0 ? ret : sqe_len; + return ret; } if (req->flags & REQ_F_BUFFER_SELECT) { @@ -3205,7 +3205,7 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req, if (!iorw) return __io_import_iovec(rw, req, iovec, iter, needs_lock); *iovec = NULL; - return iov_iter_count(&iorw->iter); + return 0; } static inline loff_t *io_kiocb_ppos(struct kiocb *kiocb) @@ -3474,7 +3474,7 @@ static int io_read(struct io_kiocb *req, bool force_nonblock, if (ret < 0) return ret; iov_count = iov_iter_count(iter); - io_size = ret; + io_size = iov_count; req->result = io_size; ret = 0; @@ -3602,7 +3602,7 @@ static int io_write(struct io_kiocb *req, bool force_nonblock, if (ret < 0) return ret; iov_count = iov_iter_count(iter); - io_size = ret; + io_size = iov_count; req->result = io_size; /* Ensure we clear previously set non-block flag */ |