about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2023-09-14 14:58:15 +0000
committerJoseph Myers <joseph@codesourcery.com>2023-09-14 14:58:15 +0000
commit803f4073cc8901ee89d73a90eed0ebfd50113f4f (patch)
tree442f359cf189a213cffa26666195389a41e161f8
parentbd77dd7e73e3530203be1c52c8a29d08270cb25d (diff)
downloadglibc-803f4073cc8901ee89d73a90eed0ebfd50113f4f.tar.gz
glibc-803f4073cc8901ee89d73a90eed0ebfd50113f4f.tar.xz
glibc-803f4073cc8901ee89d73a90eed0ebfd50113f4f.zip
Add MOVE_MOUNT_BENEATH from Linux 6.5 to sys/mount.h
This patch adds the MOVE_MOUNT_BENEATH constant from Linux 6.5 to
glibc's sys/mount.h and updates tst-mount-consts.py to reflect these
constants being up to date with that Linux kernel version.

Tested with build-many-glibcs.py.
-rw-r--r--sysdeps/unix/sysv/linux/sys/mount.h1
-rwxr-xr-xsysdeps/unix/sysv/linux/tst-mount-consts.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h
index c6da841d99..a692c0e092 100644
--- a/sysdeps/unix/sysv/linux/sys/mount.h
+++ b/sysdeps/unix/sysv/linux/sys/mount.h
@@ -226,6 +226,7 @@ struct mount_attr
 #define MOVE_MOUNT_T_AUTOMOUNTS 0x00000020 /* Follow automounts on to path */
 #define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */
 #define MOVE_MOUNT_SET_GROUP    0x00000100 /* Set sharing group instead */
+#define MOVE_MOUNT_BENEATH      0x00000200 /* Mount beneath top mount */
 
 
 /* fspick flags.  */
diff --git a/sysdeps/unix/sysv/linux/tst-mount-consts.py b/sysdeps/unix/sysv/linux/tst-mount-consts.py
index bea27e204c..b5c52a4bb2 100755
--- a/sysdeps/unix/sysv/linux/tst-mount-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-mount-consts.py
@@ -39,10 +39,10 @@ def main():
         sys.exit (77)
 
     linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
-    # Constants in glibc were updated to match Linux v6.4.  When glibc
+    # Constants in glibc were updated to match Linux v6.5.  When glibc
     # constants are updated this value should be updated to match the
     # released kernel version from which the constants were taken.
-    linux_version_glibc = (6, 4)
+    linux_version_glibc = (6, 5)
     def check(cte, exclude=None):
         return glibcextract.compare_macro_consts(
                 '#include <sys/mount.h>\n',