Commit 0f47788b authored by Linus Torvalds's avatar Linus Torvalds

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
parents 6d6444ba dbcabac1
...@@ -207,7 +207,6 @@ struct io_submit_state { ...@@ -207,7 +207,6 @@ struct io_submit_state {
bool need_plug; bool need_plug;
bool cq_flush; bool cq_flush;
unsigned short submit_nr; unsigned short submit_nr;
unsigned int cqes_count;
struct blk_plug plug; struct blk_plug plug;
}; };
......
...@@ -1259,8 +1259,8 @@ static void io_req_normal_work_add(struct io_kiocb *req) ...@@ -1259,8 +1259,8 @@ static void io_req_normal_work_add(struct io_kiocb *req)
if (ctx->flags & IORING_SETUP_SQPOLL) { if (ctx->flags & IORING_SETUP_SQPOLL) {
struct io_sq_data *sqd = ctx->sq_data; struct io_sq_data *sqd = ctx->sq_data;
if (wq_has_sleeper(&sqd->wait)) if (sqd->thread)
wake_up(&sqd->wait); __set_notify_signal(sqd->thread);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment