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

linux: Add STATX_SUBVOL definition to generic statx

The commit bbb6a742c88b4a37c5410eceefbc9c94df815075 added
STATX_SUBVOL on the statx-generic.h without updating the
generic statx struct.
---

diff --git a/io/bits/types/struct_statx.h b/io/bits/types/struct_statx.h
index 11c7a68a50..0f5ee461fc 100644
--- a/io/bits/types/struct_statx.h
+++ b/io/bits/types/struct_statx.h
@@ -52,7 +52,8 @@ struct statx
   __uint64_t stx_mnt_id;
   __uint32_t stx_dio_mem_align;
   __uint32_t stx_dio_offset_align;
-  __uint64_t __statx_pad2[12];
+  __uint64_t stx_subvol;
+  __uint64_t __statx_pad2[11];
 };
 
 #endif /* __statx_defined */
diff --git a/io/tst-statx.c b/io/tst-statx.c
index 1f7bafb01a..c7a5707c7a 100644
--- a/io/tst-statx.c
+++ b/io/tst-statx.c
@@ -37,7 +37,7 @@ _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) == 160, "statx pad2");
+_Static_assert (offsetof (struct statx, __statx_pad2) == 168, "statx pad2");
 
 #include "statx_generic.c"