From: Stefan Bühler <source@stbuehler.de>
Date: Wed, 1 May 2019 11:53:36 +0000 (+0200)
Subject: req->error only used for iopoll
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5dcf877fb13f3c6a8ba0777ef766c4af32df725d;p=openwrt%2Fstaging%2Fblogic.git

req->error only used for iopoll

No need to set it in io_poll_add; io_poll_complete doesn't use it to set
the result in the CQE.

Signed-off-by: Stefan Bühler <source@stbuehler.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 2a46de56d05c..d91cbd53d3ca 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -333,7 +333,7 @@ struct io_kiocb {
 #define REQ_F_IO_DRAIN		32	/* drain existing IO first */
 #define REQ_F_IO_DRAINED	64	/* drain done */
 	u64			user_data;
-	u32			error;
+	u32			error;	/* iopoll result from callback */
 	u32			sequence;
 
 	struct work_struct	work;
@@ -1520,7 +1520,6 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 		spin_unlock(&poll->head->lock);
 	}
 	if (mask) { /* no async, we'd stolen it */
-		req->error = mangle_poll(mask);
 		ipt.error = 0;
 		io_poll_complete(ctx, req, mask);
 	}