From: Pavel Begunkov <asml.silence@gmail.com>
Date: Sat, 5 Sep 2020 21:45:45 +0000 (+0300)
Subject: io_uring: simplify io_rw_prep_async()
X-Git-Tag: baikal/mips/sdk5.9~12522^2~38
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=06bf35bbfd5db407eb91dbc43ba5062c3b57b913;p=kernel.git

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: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3ee6ee1785d2e..6d8c2dcbfa081 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -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;
 }