[PATCH 4/9 next] fs/io_uring Don't use the return value from import_iovec().

[David Laight]

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.lai...@aculab.com>
---
 fs/io_uring.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3790c7fe9fee..0df43882e4b3 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2824,7 +2824,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) {
@@ -2853,7 +2853,7 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb 
*req,
        if (!req->io)
                return __io_import_iovec(rw, req, iovec, iter, needs_lock);
        *iovec = NULL;
-       return iov_iter_count(&req->io->rw.iter);
+       return 0;
 }
 
 static inline loff_t *io_kiocb_ppos(struct kiocb *kiocb)
@@ -3123,7 +3123,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;
 
@@ -3246,7 +3246,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 */
-- 
2.25.1

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, 
UK
Registration No: 1397386 (Wales)