Pull io_uring fixes from Jens Axboe: - Two fixes for mutex grabbing when the task state is != TASK_RUNNING (me) - Check for invalid opcode in io_uring_register() a bit earlier, to avoid going through the quiesce machinery just to return -EINVAL later in the process (me) - Fix for the uapi io_uring header, skipping including time_types.h when necessary (Stefan) * tag 'io_uring-6.2-2022-12-29' of git://git.kernel.dk/linux: uapi:io_uring.h: allow linux/time_types.h to be skipped io_uring: check for valid register opcode earlier io_uring/cancel: re-grab ctx mutex after finishing wait io_uring: finish waiting before flushing overflow entries
Showing the changes to include/uapi (1 of 3 files). Show all
Unified · Split
| @@ -10,7 +10,15 @@ · 9 unmodified lines | |||
| 10 | 10 | ||
| 11 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | /* | ||
| 14 | * this file is shared with liburing and that has to autodetect | ||
| 15 | * if linux/time_types.h is available or not, it can | ||
| 16 | * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H | ||
| 17 | * if linux/time_types.h is not available | ||
| 18 | */ | ||
| 19 | #ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H | ||
| 13 | #include <linux/time_types.h> | 20 | #include <linux/time_types.h> |
| 21 | #endif | ||
| 14 | 22 | ||
| 15 | #ifdef __cplusplus | 23 | #ifdef __cplusplus |
| 16 | extern "C" { | 24 | extern "C" { |