public inbox for
help / color / mirror / Atom feed
From: Adhemerval Zanella <>
Subject: [glibc/release/2.36/master] Linux: Fix enum fsconfig_command detection in <sys/mount.h>
Date: Wed, 24 Aug 2022 13:06:25 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=3bd3c612e98a53ce60ed972f5cd2b90628b3cba5

commit 3bd3c612e98a53ce60ed972f5cd2b90628b3cba5
Author: Florian Weimer <>
Date:   Tue Aug 16 09:25:23 2022 +0200

    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").
    (cherry picked from commit 2955ef4b7c9b56fcd7abfeddef7ee83c60abff98)

 sysdeps/unix/sysv/linux/sys/mount.h | 6 +++---
 1 file 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
+/* 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() */

                 reply	other threads:[~2022-08-24 13:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).