Skip to content

Commit 87c4311

Browse files
committed
io_uring: kill callback_head argument for io_req_task_work_add()
We always use &req->task_work anyway, no point in passing it in. Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent c1379e2 commit 87c4311

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

fs/io_uring.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,8 +1886,7 @@ static struct io_kiocb *io_req_find_next(struct io_kiocb *req)
18861886
return __io_req_find_next(req);
18871887
}
18881888

1889-
static int io_req_task_work_add(struct io_kiocb *req, struct callback_head *cb,
1890-
bool twa_signal_ok)
1889+
static int io_req_task_work_add(struct io_kiocb *req, bool twa_signal_ok)
18911890
{
18921891
struct task_struct *tsk = req->task;
18931892
struct io_ring_ctx *ctx = req->ctx;
@@ -1906,7 +1905,7 @@ static int io_req_task_work_add(struct io_kiocb *req, struct callback_head *cb,
19061905
if (!(ctx->flags & IORING_SETUP_SQPOLL) && twa_signal_ok)
19071906
notify = TWA_SIGNAL;
19081907

1909-
ret = task_work_add(tsk, cb, notify);
1908+
ret = task_work_add(tsk, &req->task_work, notify);
19101909
if (!ret)
19111910
wake_up_process(tsk);
19121911

@@ -1965,7 +1964,7 @@ static void io_req_task_queue(struct io_kiocb *req)
19651964
init_task_work(&req->task_work, io_req_task_submit);
19661965
percpu_ref_get(&req->ctx->refs);
19671966

1968-
ret = io_req_task_work_add(req, &req->task_work, true);
1967+
ret = io_req_task_work_add(req, true);
19691968
if (unlikely(ret)) {
19701969
struct task_struct *tsk;
19711970

@@ -3185,7 +3184,7 @@ static int io_async_buf_func(struct wait_queue_entry *wait, unsigned mode,
31853184

31863185
/* submit ref gets dropped, acquire a new one */
31873186
refcount_inc(&req->refs);
3188-
ret = io_req_task_work_add(req, &req->task_work, true);
3187+
ret = io_req_task_work_add(req, true);
31893188
if (unlikely(ret)) {
31903189
struct task_struct *tsk;
31913190

@@ -4752,7 +4751,7 @@ static int __io_async_wake(struct io_kiocb *req, struct io_poll_iocb *poll,
47524751
* of executing it. We can't safely execute it anyway, as we may not
47534752
* have the needed state needed for it anyway.
47544753
*/
4755-
ret = io_req_task_work_add(req, &req->task_work, twa_signal_ok);
4754+
ret = io_req_task_work_add(req, twa_signal_ok);
47564755
if (unlikely(ret)) {
47574756
struct task_struct *tsk;
47584757

0 commit comments

Comments
 (0)