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/rw.c | |
| parent | 92219afb980e01d88a1ac6d8fe01dcae255c4279 (diff) | |
| download | linux-stable-8e5b3b89ecaf6d9295e561c225b35c574a5e0fe7.tar.gz linux-stable-8e5b3b89ecaf6d9295e561c225b35c574a5e0fe7.tar.bz2 linux-stable-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/rw.c')
| -rw-r--r-- | io_uring/rw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index 0afe4f9e0e3f..674581bda8d7 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -305,11 +305,9 @@ void io_req_rw_complete(struct io_kiocb *req, struct io_tw_state *ts) io_req_io_end(req); - if (req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING)) { - unsigned issue_flags = ts->locked ? 0 : IO_URING_F_UNLOCKED; + if (req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING)) + req->cqe.flags |= io_put_kbuf(req, 0); - req->cqe.flags |= io_put_kbuf(req, issue_flags); - } io_req_task_complete(req, ts); } |