Skip to content

Commit 0f47788

Browse files
committed
Merge tag 'io_uring-6.10-20240627' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe: "Removal of a struct member that's unused since the 6.10 merge window, and a fix for a regression in SQPOLL wakeups, bringing it back to how it worked before the SQPOLL local task_work" * tag 'io_uring-6.10-20240627' of git://git.kernel.dk/linux: io_uring: signal SQPOLL task_work with TWA_SIGNAL_NO_IPI io_uring: remove dead struct io_submit_state member
2 parents 6d6444b + dbcabac commit 0f47788

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

include/linux/io_uring_types.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ struct io_submit_state {
207207
bool need_plug;
208208
bool cq_flush;
209209
unsigned short submit_nr;
210-
unsigned int cqes_count;
211210
struct blk_plug plug;
212211
};
213212

io_uring/io_uring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,8 +1259,8 @@ static void io_req_normal_work_add(struct io_kiocb *req)
12591259
if (ctx->flags & IORING_SETUP_SQPOLL) {
12601260
struct io_sq_data *sqd = ctx->sq_data;
12611261

1262-
if (wq_has_sleeper(&sqd->wait))
1263-
wake_up(&sqd->wait);
1262+
if (sqd->thread)
1263+
__set_notify_signal(sqd->thread);
12641264
return;
12651265
}
12661266

0 commit comments

Comments
 (0)