* [PATCH v1 1/1] [io_uring] req->error only used for iopoll
@ 2019-05-01 11:53 Stefan Bühler
2019-05-01 21:57 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Bühler @ 2019-05-01 11:53 UTC (permalink / raw)
To: Jens Axboe, linux-block, linux-fsdevel
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(-)
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);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1 1/1] [io_uring] req->error only used for iopoll
2019-05-01 11:53 [PATCH v1 1/1] [io_uring] req->error only used for iopoll Stefan Bühler
@ 2019-05-01 21:57 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2019-05-01 21:57 UTC (permalink / raw)
To: Stefan Bühler, linux-block, linux-fsdevel
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.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-01 21:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-01 11:53 [PATCH v1 1/1] [io_uring] req->error only used for iopoll Stefan Bühler
2019-05-01 21:57 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).