diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-22 17:30:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-22 17:30:09 +0100 |
| commit | dbab40bdb42c03ab12096d4aaf2dbef3fb55282c (patch) | |
| tree | 434c8bd1d70fe4d123f2d0e7cdd52b42e48e3e63 /include | |
| parent | Merge tag 'fixes_for_v5.5-rc8' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | io_uring: fix compat for IORING_REGISTER_FILES_UPDATE (diff) | |
| download | linux-dbab40bdb42c03ab12096d4aaf2dbef3fb55282c.tar.xz linux-dbab40bdb42c03ab12096d4aaf2dbef3fb55282c.zip | |
Merge tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block
Pull io_uring fix from Jens Axboe:
"This was supposed to have gone in last week, but due to a brain fart
on my part, I forgot that we made this struct addition in the 5.5
cycle. So here it is for 5.5, to prevent having a 32 vs 64-bit
compatability issue with the files_update command"
* tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block:
io_uring: fix compat for IORING_REGISTER_FILES_UPDATE
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index a3300e1b9a01..55cfcb71606d 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -178,7 +178,8 @@ struct io_uring_params { struct io_uring_files_update { __u32 offset; - __s32 *fds; + __u32 resv; + __aligned_u64 /* __s32 * */ fds; }; #endif |