From 3cc6a9c76e3945f6cf3259ec564ec74d3b40dafd Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Tue, 27 Aug 2024 07:39:48 +0200 Subject: [PATCH] Linux: updates to stat scructs I added these as part of the work on bug 317127. --- include/vki/vki-amd64-linux.h | 23 ++++++++++++++++++++++- include/vki/vki-linux.h | 7 ++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h index e5b7ec6cd1..12cd65ac7c 100644 --- a/include/vki/vki-amd64-linux.h +++ b/include/vki/vki-amd64-linux.h @@ -375,7 +375,28 @@ struct vki_statfs { __vki_kernel_fsid_t f_fsid; long f_namelen; long f_frsize; - long f_spare[5]; + long f_flags; + long f_spare[4]; +}; + +//---------------------------------------------------------------------- +// From bits/statfs.h +//---------------------------------------------------------------------- + +struct vki_statfs64 +{ + long f_type; + long f_bsize; + unsigned long f_blocks; + unsigned long f_bfree; + unsigned long f_bavail; + unsigned long f_files; + unsigned long f_ffree; + __vki_kernel_fsid_t f_fsid; + long f_namelen; + long f_frsize; + long f_flags; + long f_spare[4]; }; //---------------------------------------------------------------------- diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h index ccdb808af7..708a12b64d 100644 --- a/include/vki/vki-linux.h +++ b/include/vki/vki-linux.h @@ -1472,7 +1472,12 @@ struct vki_statx { __vki_u32 stx_dev_major; /* ID of device containing file [uncond] */ __vki_u32 stx_dev_minor; /* 0x90 */ - __vki_u64 __spare2[14]; /* Spare space for future expansion */ + __vki_u64 stx_mnt_id; + __vki_u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */ + __vki_u32 stx_dio_offset_align; /* File offset alignment for direct I/O */ + /* 0xa0 */ + + __vki_u64 __spare2[12]; /* Spare space for future expansion */ /* 0x100 */ }; -- 2.47.2