Commit 10fc72e4 authored by David Laight's avatar David Laight Committed by Jens Axboe
Browse files

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: default avatarDavid Laight <david.laight@aculab.com>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1a38ffc9

fs/io_uring.c

+4 −4
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE