android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs/io_uring Don't use the return value from import_iovec().

Browse Source 
[ Upstream commit 10fc72e43352753a08f9cf83aa5c40baec00d212 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
David Laight 2020-11-07 13:16:25 +00:00 committed by Greg Kroah-Hartman
parent 2c304c65de
commit 6930a2a5be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/io_uring.c
View File

@ -3128,7 +3128,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) {
@ -3154,7 +3154,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)
@ -3423,7 +3423,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;
@ -3552,7 +3552,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 */