Commit f4bff104 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: simplify io_rw_prep_async() 



Don't touch iter->iov and iov in between __io_import_iovec() and
io_req_map_rw(), the former function aleady sets it correctly, because it
creates one more case with NULL'ed iov to consider in io_req_map_rw().

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 90554200

fs/io_uring.c

+2 −4
Original line number Diff line number Diff line
@@ -3065,16 +3065,14 @@ static inline int io_rw_prep_async(struct io_kiocb *req, int rw, 
				   bool force_nonblock)

{

	struct io_async_rw *iorw = &req->io->rw;

	struct iovec *iov;

	struct iovec *iov = iorw->fast_iov;

	ssize_t ret;



	iorw->iter.iov = iov = iorw->fast_iov;

	ret = __io_import_iovec(rw, req, &iov, &iorw->iter, !force_nonblock);

	if (unlikely(ret < 0))

		return ret;



	iorw->iter.iov = iov;

	io_req_map_rw(req, iorw->iter.iov, iorw->fast_iov, &iorw->iter);

	io_req_map_rw(req, iov, iorw->fast_iov, &iorw->iter);

	return 0;

}