[PATCH] linux: Fix sys/mount.h usage of FSOPEN_CLOEXEC

[PATCH] linux: Fix sys/mount.h usage of FSOPEN_CLOEXEC

[Radostin Stoyanov]

In commit 774058d72942249f71d74e7f2b639f77184160a6 was introduced
ifndef FSOPEN_CLOEXEC condition surrounding fsconfig_command.
However, the compilation would fail when there are multiple
`define FSOPEN_CLOEXEC`. This patch moves the #endif for
`#ifndef FSOPEN_CLOEXEC` after `#define FSOPEN_CLOEXEC`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 sysdeps/unix/sysv/linux/sys/mount.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h
index 19841d0738..92476ba2e7 100644
--- a/sysdeps/unix/sysv/linux/sys/mount.h
+++ b/sysdeps/unix/sysv/linux/sys/mount.h
@@ -256,11 +256,12 @@ enum fsconfig_command
   FSCONFIG_CMD_RECONFIGURE = 7,   /* Invoke superblock reconfiguration */
 # define FSCONFIG_CMD_RECONFIGURE FSCONFIG_CMD_RECONFIGURE
 };
-#endif
 
 /* fsopen flags.  */
 #define FSOPEN_CLOEXEC          0x00000001
 
+#endif
+
 /* 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() */
-- 
2.37.2

Re: [PATCH] linux: Fix sys/mount.h usage of FSOPEN_CLOEXEC

[Florian Weimer]

* Radostin Stoyanov:

> In commit 774058d72942249f71d74e7f2b639f77184160a6 was introduced
> ifndef FSOPEN_CLOEXEC condition surrounding fsconfig_command.
> However, the compilation would fail when there are multiple
> `define FSOPEN_CLOEXEC`. This patch moves the #endif for
> `#ifndef FSOPEN_CLOEXEC` after `#define FSOPEN_CLOEXEC`.
>
> Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>

Do you have an example of such a compilation failure?  Redudant
definitions with the same token sequence do not result in warnings.

With the redundant definition, we can check if the kernel value and our
value still match.

Thanks,
Florian