Commit 1c6492d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.3-2023-04-14' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "Just a small tweak to when task_work needs redirection, marked for
  stable as well"

* tag 'io_uring-6.3-2023-04-14' of git://git.kernel.dk/linux:
  io_uring: complete request via task work in case of DEFER_TASKRUN
parents 7a934f4b 860e1c7f

io_uring/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ static void __io_req_complete_post(struct io_kiocb *req) 


void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)

{

	if (req->ctx->task_complete && (issue_flags & IO_URING_F_IOWQ)) {

	if (req->ctx->task_complete && req->ctx->submitter_task != current) {

		req->io_task_work.func = io_req_task_complete;

		io_req_task_work_add(req);

	} else if (!(issue_flags & IO_URING_F_UNLOCKED) ||