summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-08-16 09:25:23 +0200
committerFlorian Weimer <fweimer@redhat.com>2022-08-16 12:03:28 +0200
commit2955ef4b7c9b56fcd7abfeddef7ee83c60abff98 (patch)
treebd721c443fffd6c8714c3032a162306b8709a5fb
parentdd2315a866a4ac2b838ea1cb10c5ea1c35d51a2f (diff)
downloadglibc-2955ef4b7c9b56fcd7abfeddef7ee83c60abff98.tar.gz
glibc-2955ef4b7c9b56fcd7abfeddef7ee83c60abff98.tar.xz
glibc-2955ef4b7c9b56fcd7abfeddef7ee83c60abff98.zip
Linux: Fix enum fsconfig_command detection in <sys/mount.h>
The #ifdef FSOPEN_CLOEXEC check did not work because the macro
was always defined in this header prior to the check, so that
the <linux/mount.h> contents did not matter.

Fixes commit 774058d72942249f71d74e7f2b639f77184160a6
("linux: Fix sys/mount.h usage with kernel headers").
-rw-r--r--sysdeps/unix/sysv/linux/sys/mount.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h
index 2e3fd6a7fe..19841d0738 100644
--- a/sysdeps/unix/sysv/linux/sys/mount.h
+++ b/sysdeps/unix/sysv/linux/sys/mount.h
@@ -188,9 +188,6 @@ enum
 };
 
 
-/* fsopen flags.  */
-#define FSOPEN_CLOEXEC          0x00000001
-
 /* fsmount flags.  */
 #define FSMOUNT_CLOEXEC         0x00000001
 
@@ -261,6 +258,9 @@ enum fsconfig_command
 };
 #endif
 
+/* fsopen flags.  */
+#define FSOPEN_CLOEXEC          0x00000001
+
 /* open_tree flags.  */
 #define OPEN_TREE_CLONE    1         /* Clone the target tree and attach the clone */
 #define OPEN_TREE_CLOEXEC  O_CLOEXEC /* Close the file on execve() */