diff options
| author | Carlos Maiolino <cem@kernel.org> | 2025-05-14 12:38:53 +0200 |
|---|---|---|
| committer | Carlos Maiolino <cem@kernel.org> | 2025-05-14 12:38:53 +0200 |
| commit | 6e7d71b3a0f9732863b6a1366c9d875cec52c842 (patch) | |
| tree | 2ae0295a950939f40b39aa0aff344a8e70d97e76 /include/uapi/linux | |
| parent | c0a5c4084709a78117c1c372aa4f813e1a98c313 (diff) | |
| parent | 4abb9052a72bc98d521b0535b5deee243a3bbd12 (diff) | |
Merge branch 'atomic_writes-6.16' into xfs-6.16-merge
Required update due to conflict with patch:
xfs: stop using set_blocksize
Conflicts:
fs/xfs/xfs_buf.c
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/stat.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h index f78ee3670dd5..1686861aae20 100644 --- a/include/uapi/linux/stat.h +++ b/include/uapi/linux/stat.h @@ -182,8 +182,12 @@ struct statx { /* File offset alignment for direct I/O reads */ __u32 stx_dio_read_offset_align; - /* 0xb8 */ - __u64 __spare3[9]; /* Spare space for future expansion */ + /* Optimised max atomic write unit in bytes */ + __u32 stx_atomic_write_unit_max_opt; + __u32 __spare2[1]; + + /* 0xc0 */ + __u64 __spare3[8]; /* Spare space for future expansion */ /* 0x100 */ }; |