diff mbox series

[v1,1/1,io_uring] req->error only used for iopoll

Message ID 20190501115336.13438-1-source@stbuehler.de (mailing list archive)
State Accepted, archived
Headers show
Series [v1,1/1,io_uring] req->error only used for iopoll | expand

Commit Message

Stefan Bühler May 1, 2019, 11:53 a.m. UTC 
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>
---
 fs/io_uring.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Jens Axboe May 1, 2019, 9:57 p.m. UTC | #1 
On 5/1/19 5:53 AM, Stefan Bühler wrote:
> No need to set it in io_poll_add; io_poll_complete doesn't use it to set
> the result in the CQE.

Looks good, I added this for the 5.2 series. Thanks.
diff mbox series

Patch

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 6a480f04b0f3..44eb01188838 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -328,7 +328,7 @@  struct io_kiocb {
 #define REQ_F_SEQ_PREV		8	/* sequential with previous */
 #define REQ_F_PREPPED		16	/* prep already done */
 	u64			user_data;
-	u64			error;
+	u64			error;	/* iopoll result from callback */
 
 	struct work_struct	work;
 };
@@ -1426,7 +1426,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);
 	}