diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-01-21 03:01:17 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-21 03:01:17 +0300 |
| commit | 4d927483732f759769613388813ff5dbb29902a7 (patch) | |
| tree | 46397f35be6b442f530450f292d7ee8593f845bf /include | |
| parent | fa7773deb344fbfe0405d1720d4a0cdd5970369e (diff) | |
| parent | 1292e972fff2b2d81e139e0c2fe5f50249e78c58 (diff) | |
| download | linux-4d927483732f759769613388813ff5dbb29902a7.tar.xz | |
Merge branch 'io_uring-5.5' into for-5.6/io_uring-vfs
Pull in compatability fix for the files_update command.
* io_uring-5.5:
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 |