To pick up changes from: 5d894321c49e6137 ("fs: add atomic write unit max opt to statx") a516403787e08119 ("fs/proc: extend the PAGEMAP_SCAN ioctl to report guard regions") c07d3aede2b26830 ("fscrypt: add support for hardware-wrapped keys") These are used to beautify fs syscall arguments, albeit the changes in this update are not affecting those beautifiers. This addresses these tools/ build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h diff -u tools/include/uapi/linux/stat.h include/uapi/linux/stat.h diff -u tools/perf/trace/beauty/include/uapi/linux/fs.h include/uapi/linux/fs.h diff -u tools/perf/trace/beauty/include/uapi/linux/stat.h include/uapi/linux/stat.h Please see tools/include/uapi/README for details (it's in the first patch of this series).
Showing the changes to tools/include/uapi/linux (2 of 4 files). Show all
Unified · Split
| @@ -119,7 +119,7 @@ struct fscrypt_key_specifier { · 118 unmodified lines | |||
| 119 | */ | 119 | */ |
| 120 | struct fscrypt_provisioning_key_payload { | 120 | struct fscrypt_provisioning_key_payload { |
| 121 | __u32 type; | 121 | __u32 type; |
| 122 | __u32 __reserved; | 122 | __u32 flags; |
| 123 | __u8 raw[]; | 123 | __u8 raw[]; |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| @@ -128,7 +128,9 @@ struct fscrypt_add_key_arg { · 2 unmodified lines | |||
| 128 | struct fscrypt_key_specifier key_spec; | 128 | struct fscrypt_key_specifier key_spec; |
| 129 | __u32 raw_size; | 129 | __u32 raw_size; |
| 130 | __u32 key_id; | 130 | __u32 key_id; |
| 131 | __u32 __reserved[8]; | 131 | #define FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED 0x00000001 |
| 132 | __u32 flags; | ||
| 133 | __u32 __reserved[7]; | ||
| 132 | __u8 raw[]; | 134 | __u8 raw[]; |
| 133 | }; | 135 | }; |
| 134 | 136 | ||
| @@ -182,8 +182,12 @@ struct statx { · 181 unmodified lines | |||
| 182 | /* File offset alignment for direct I/O reads */ | 182 | /* File offset alignment for direct I/O reads */ |
| 183 | __u32 stx_dio_read_offset_align; | 183 | __u32 stx_dio_read_offset_align; |
| 184 | 184 | ||
| 185 | /* 0xb8 */ | 185 | /* Optimised max atomic write unit in bytes */ |
| 186 | __u64 __spare3[9]; /* Spare space for future expansion */ | 186 | __u32 stx_atomic_write_unit_max_opt; |
| 187 | __u32 __spare2[1]; | ||
| 188 | |||
| 189 | /* 0xc0 */ | ||
| 190 | __u64 __spare3[8]; /* Spare space for future expansion */ | ||
| 187 | 191 | ||
| 188 | /* 0x100 */ | 192 | /* 0x100 */ |
| 189 | }; | 193 | }; |