Commit 8b9a0228 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.16-2021-12-03' of git://git.kernel.dk/linux-block 

Pull io_uring fix from Jens Axboe:
 "Just a single fix preventing repeated retries of task_work based io-wq
  thread creation, fixing a regression from when io-wq was made more (a
  bit too much) resilient against signals"

* tag 'io_uring-5.16-2021-12-03' of git://git.kernel.dk/linux-block:
  io-wq: don't retry task_work creation failure on fatal conditions
parents e3b8bb45 a226abcd

fs/io-wq.c

+7 −0
Original line number Diff line number Diff line
@@ -714,6 +714,13 @@ static bool io_wq_work_match_all(struct io_wq_work *work, void *data) 


static inline bool io_should_retry_thread(long err)

{

	/*

	 * Prevent perpetual task_work retry, if the task (or its group) is

	 * exiting.

	 */

	if (fatal_signal_pending(current))

		return false;



	switch (err) {

	case -EAGAIN:

	case -ERESTARTSYS: