Skip to contentSkip to conversation

req->error only used for iopoll

PATCH In review Stefan Bühler 2 participants 2 messages May 1, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 fs/io_uring.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/io_uring.c +1 -2
index 6a480f04b0f3..44eb01188838 100644
@@ -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);
 	}
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 2 lines · Stefan Bühler

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.

Signature · 1 line
Jens Axboe