From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 27 Aug 2024 05:39:48 +0000 (+0200)
Subject: Linux: updates to stat scructs
X-Git-Tag: VALGRIND_3_24_0~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cc6a9c76e3945f6cf3259ec564ec74d3b40dafd;p=thirdparty%2Fvalgrind.git

Linux: updates to stat scructs

I added these as part of the work on bug 317127.
---

diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index e5b7ec6cd..12cd65ac7 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 ccdb808af..708a12b64 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 */
 };