History

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

Linus Torvalds committed 6 years ago

Commit dbab40b2 parents d96d875 1292e972 files · +5 −2Browse files

Showing the changes to include/uapi (1 of 2 files). Show all

Unified · Split

include/uapi/linux/io_uring.h+2−1
@@ -178,7 +178,8 @@ struct io_uring_params { · 177 unmodified lines
178 178
179struct io_uring_files_update {179struct io_uring_files_update {
180 __u32 offset;180 __u32 offset;
181 __s32 *fds;181 __u32 resv;
182 __aligned_u64 /* __s32 * */ fds;
182};183};
183 184
184#endif185#endif