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 e5b7ec6cd1d3cd08b50677e134ac0def73a69a75..12cd65ac7c3207a1fba1fab33fc276e02aa9a7ff 100644 (file)
--- 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 ccdb808af7a6790948aabfdba7f2a66948e22ba3..708a12b64d03753d7246c47109d68d0120d92165 100644 (file)
--- 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 */
 };