diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-05 16:58:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-05 16:58:52 -0700 |
| commit | 4f72ed492d7798919269a20d157d34495a988935 (patch) | |
| tree | b75d2b97f191d169ab3c304ac082ca35b3faf932 /include | |
| parent | 4de2ff261f535f2ed6ef56d4acf5f888ed8b95bc (diff) | |
| parent | 561e4f9451d65fc2f7eef564e0064373e3019793 (diff) | |
Merge tag 'io_uring-6.9-20240405' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
- Backport of some fixes that came up during development of the 6.10
io_uring patches. This includes some kbuf cleanups and reference
fixes.
- Disable multishot read if we don't have NOWAIT support on the target
- Fix for a dependency issue with workqueue flushing
* tag 'io_uring-6.9-20240405' of git://git.kernel.dk/linux:
io_uring/kbuf: hold io_buffer_list reference over mmap
io_uring/kbuf: protect io_buffer_list teardown with a reference
io_uring/kbuf: get rid of bl->is_ready
io_uring/kbuf: get rid of lower BGID lists
io_uring: use private workqueue for exit work
io_uring: disable io-wq execution of multishot NOWAIT requests
io_uring/rw: don't allow multishot reads without NOWAIT support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/io_uring_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index e24893625085..05df0e399d7c 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -294,7 +294,6 @@ struct io_ring_ctx { struct io_submit_state submit_state; - struct io_buffer_list *io_bl; struct xarray io_bl_xa; struct io_hash_table cancel_table_locked; |