diff options
| author |  Pavel Begunkov <asml.silence@gmail.com>
| 2024-03-18 22:00:30 +0000 |
|---|---|---|
| committer |  Jens Axboe <axboe@kernel.dk>
| 2024-04-15 08:10:24 -0600 |
| commit | 8e5b3b89ecaf6d9295e561c225b35c574a5e0fe7 (patch) | |
| tree | 6a35205e09dd5a3ec397a3c1c38445b032856000 /io_uring/poll.c | |
| parent | io_uring: force tw ctx locking (diff) | |
| download | linux-8e5b3b89ecaf6d9295e561c225b35c574a5e0fe7.tar.gz linux-8e5b3b89ecaf6d9295e561c225b35c574a5e0fe7.tar.bz2 linux-8e5b3b89ecaf6d9295e561c225b35c574a5e0fe7.zip | |
io_uring: remove struct io_tw_state::locked
ctx is always locked for task_work now, so get rid of struct
io_tw_state::locked. Note I'm stopping one step before removing
io_tw_state altogether, which is not empty, because it still serves the
purpose of indicating which function is a tw callback and forcing users
not to invoke them carelessly out of a wrong context. The removal can
always be done later.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Tested-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/e95e1ea116d0bfa54b656076e6a977bc221392a4.1710799188.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/poll.c')
| -rw-r--r-- | io_uring/poll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/poll.c b/io_uring/poll.c index 6db1dcb2c797..8901dd118e50 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -322,7 +322,7 @@ static int io_poll_check_events(struct io_kiocb *req, struct io_tw_state *ts) __poll_t mask = mangle_poll(req->cqe.res & req->apoll_events); - if (!io_fill_cqe_req_aux(req, ts->locked, mask, + if (!io_fill_cqe_req_aux(req, true, mask, IORING_CQE_F_MORE)) { io_req_set_res(req, mask, 0); return IOU_POLL_REMOVE_POLL_USE_RES; |