Merge tag 'io_uring-5.14-2021-08-07' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2021 17:34:26 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2021 17:34:26 +0000 (10:34 -0700)
commit85a90500f9a1717c4e142ce92e6c1cb1a339ec78
tree9698ecbc6498e06b5a0a640a7656b262bfef5874
parent6bbf59145c4b29a384b0a66d63ddfbf55eeb91c4
parent21698274da5b6fc724b005bc7ec3e6b9fbcfaa06
Merge tag 'io_uring-5.14-2021-08-07' of git://git.kernel.dk/linux-block

Pull io_uring from Jens Axboe:
 "A few io-wq related fixes:

   - Fix potential nr_worker race and missing max_workers check from one
     path (Hao)

   - Fix race between worker exiting and new work queue (me)"

* tag 'io_uring-5.14-2021-08-07' of git://git.kernel.dk/linux-block:
  io-wq: fix lack of acct->nr_workers < acct->max_workers judgement
  io-wq: fix no lock protection of acct->nr_worker
  io-wq: fix race between worker exiting and activating free worker