From: Darrick J. Wong <djwong@xxxxxxxxxx> Dump the new atomic writes statx field that's being submitted for 6.16. Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx> --- libfrog/statx.h | 6 +++++- io/stat.c | 1 + m4/package_libcdev.m4 | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libfrog/statx.h b/libfrog/statx.h index b76dfae21e7092..e11e2d8f49fa5f 100644 --- a/libfrog/statx.h +++ b/libfrog/statx.h @@ -143,7 +143,11 @@ struct statx { __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 */ }; diff --git a/io/stat.c b/io/stat.c index 46475df343470c..c257037aa8eec3 100644 --- a/io/stat.c +++ b/io/stat.c @@ -396,6 +396,7 @@ dump_raw_statx(struct statx *stx) printf("stat.atomic_write_unit_max = %u\n", stx->stx_atomic_write_unit_max); printf("stat.atomic_write_segments_max = %u\n", stx->stx_atomic_write_segments_max); printf("stat.dio_read_offset_align = %u\n", stx->stx_dio_read_offset_align); + printf("stat.atomic_write_unit_max_opt = %u\n", stx->stx_atomic_write_unit_max_opt); return 0; } diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 index 61353d0aa9d536..b77ac1a7580a80 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -126,7 +126,7 @@ AC_DEFUN([AC_NEED_INTERNAL_FSCRYPT_POLICY_V2], AC_DEFUN([AC_NEED_INTERNAL_STATX], [ AC_CHECK_TYPE(struct statx, [ - AC_CHECK_MEMBER(struct statx.stx_dio_read_offset_align, + AC_CHECK_MEMBER(struct statx.stx_atomic_write_unit_max_opt, , need_internal_statx=yes, [#include <linux/stat.h>]