From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri, 3 Oct 2025 19:38:59 +0000 (-0300)
Subject: linux: Add STATX_WRITE_ATOMIC/STATX_ATTR_WRITE_ATOMIC definitions to generic statx
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a2ace34fccaf7eedcbd04ae0e09563a1e95c14d;p=thirdparty%2Fglibc.git

linux: Add STATX_WRITE_ATOMIC/STATX_ATTR_WRITE_ATOMIC definitions to generic statx

The commit fc650bfd71081d26c1015d299827fb58a23a6b02 added
STATX_WRITE_ATOMIC/STATX_ATTR_WRITE_ATOMIC on the statx-generic.h
without updating the generic statx struct.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/io/bits/types/struct_statx.h b/io/bits/types/struct_statx.h
index 0f5ee461fc..2cd81c112b 100644
--- a/io/bits/types/struct_statx.h
+++ b/io/bits/types/struct_statx.h
@@ -53,7 +53,11 @@ struct statx
   __uint32_t stx_dio_mem_align;
   __uint32_t stx_dio_offset_align;
   __uint64_t stx_subvol;
-  __uint64_t __statx_pad2[11];
+  __uint32_t stx_atomic_write_unit_min;
+  __uint32_t stx_atomic_write_unit_max;
+  __uint32_t stx_atomic_write_segments_max;
+  __uint32_t __statx_pad2;
+  __uint64_t __statx_pad3[9];
 };
 
 #endif /* __statx_defined */
diff --git a/io/tst-statx.c b/io/tst-statx.c
index c7a5707c7a..d691d157e0 100644
--- a/io/tst-statx.c
+++ b/io/tst-statx.c
@@ -37,7 +37,8 @@ _Static_assert (offsetof (struct statx, stx_nlink) == 16, "statx nlink");
 _Static_assert (offsetof (struct statx, stx_ino) == 32, "statx ino");
 _Static_assert (offsetof (struct statx, stx_atime) == 64, "statx atime");
 _Static_assert (offsetof (struct statx, stx_rdev_major) == 128, "statx rdev");
-_Static_assert (offsetof (struct statx, __statx_pad2) == 168, "statx pad2");
+_Static_assert (offsetof (struct statx, __statx_pad2) == 0xb4, "statx pad2");
+_Static_assert (offsetof (struct statx, __statx_pad3) == 0xb8, "statx pad3");
 
 #include "statx_generic.c"