diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-07 13:49:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-07 13:49:24 -0800 |
| commit | e9c02d68cc26b28a9a12ebd1aeaed673ad0e73e2 (patch) | |
| tree | 60e09cd3011f8b70475291b85a9474255bfbdc27 /include | |
| parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
| parent | io_uring: fix link lookup racing with link timeout (diff) | |
| download | linux-dev-e9c02d68cc26b28a9a12ebd1aeaed673ad0e73e2.tar.xz linux-dev-e9c02d68cc26b28a9a12ebd1aeaed673ad0e73e2.zip | |
Merge tag 'io_uring-5.10-2020-11-07' of git://git.kernel.dk/linux-block
Pull io_uring fixes from Jens Axboe:
"A set of fixes for io_uring:
- SQPOLL cancelation fixes
- Two fixes for the io_identity COW
- Cancelation overflow fix (Pavel)
- Drain request cancelation fix (Pavel)
- Link timeout race fix (Pavel)"
* tag 'io_uring-5.10-2020-11-07' of git://git.kernel.dk/linux-block:
io_uring: fix link lookup racing with link timeout
io_uring: use correct pointer for io_uring_show_cred()
io_uring: don't forget to task-cancel drained reqs
io_uring: fix overflowed cancel w/ linked ->files
io_uring: drop req/tctx io_identity separately
io_uring: ensure consistent view of original task ->mm from SQPOLL
io_uring: properly handle SQPOLL request cancelations
io-wq: cancel request if it's asking for files and we don't have them
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/io_uring.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index 868364cea3b7..35b2d845704d 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -30,7 +30,8 @@ struct io_uring_task { struct percpu_counter inflight; struct io_identity __identity; struct io_identity *identity; - bool in_idle; + atomic_t in_idle; + bool sqpoll; }; #if defined(CONFIG_IO_URING) |