Discussion:
https://lore.kernel.org/lkml/20180702084622.GA15274@yury-thinkpad/
Although RENAME_* macros are exposed in kernel headers, they are not
used by glibc. That's because linux/fs.h which hosts RENAME_* is
considered unsuitable by glibc developers:
As Florian Weimer wrote:
> <linux/fs.h> undefines and defines macros not mentioned in the standards
> (and it even contains a few unrelated structs), so we cannot include it
> without _GNU_SOURCE.
>
> It might be possible to include it only for _GNU_SOURCE, but there are a
> lot of things in <linux/fs.h>, so that does not seem to be particularly
> advisable.
In this patch RENAME_* is removed to a separated header file that
conforms the standards and therefore is suitable for inclusion by glibc.
v2:
- rename dedicated file to 'rename-flags.h', as requested by Florian.
Signed-off-by: Yury Norov <[email protected]>
---
include/uapi/linux/fs.h | 4 +---
include/uapi/linux/rename-flags.h | 12 ++++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 include/uapi/linux/rename-flags.h
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index 73e01918f996..34c308203746 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -39,9 +39,7 @@
#define SEEK_HOLE 4 /* seek to the next hole */
#define SEEK_MAX SEEK_HOLE
-#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
-#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
-#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
+#include <linux/rename-flags.h>
struct file_clone_range {
__s64 src_fd;
diff --git a/include/uapi/linux/rename-flags.h b/include/uapi/linux/rename-flags.h
new file mode 100644
index 000000000000..7178f0565657
--- /dev/null
+++ b/include/uapi/linux/rename-flags.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_RENAME_H
+#define _UAPI_LINUX_RENAME_H
+
+/*
+ * Definitions for rename syscall family.
+ */
+#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
+#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
+#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
+
+#endif /* _UAPI_LINUX_RENAME_H */
--
2.17.1
Hi all,
It seems that I forgot to rename guards in v2. This is the correct
version. My apologize for noise.
Yury
From 61215b1cb559e69fb57f2a82864e72e3a1ef4b12 Mon Sep 17 00:00:00 2001
From: Yury Norov <[email protected]>
Date: Wed, 14 Nov 2018 09:51:49 +0300
To: Andrew Morton <[email protected]>,
Alexander Viro <[email protected]>,
Florian Weimer <[email protected]>
CC: [email protected], [email protected],
[email protected], [email protected]
Subject: [PATCH v2] UAPI: move RENAME_* definitions to separated file
Discussion:
https://lore.kernel.org/lkml/20180702084622.GA15274@yury-thinkpad/
Although RENAME_* macros are exposed in kernel headers, they are not
used by glibc. That's because linux/fs.h which hosts RENAME_* is
considered unsuitable by glibc developers:
As Florian Weimer wrote:
> <linux/fs.h> undefines and defines macros not mentioned in the standards
> (and it even contains a few unrelated structs), so we cannot include it
> without _GNU_SOURCE.
>
> It might be possible to include it only for _GNU_SOURCE, but there are a
> lot of things in <linux/fs.h>, so that does not seem to be particularly
> advisable.
In this patch RENAME_* is removed to a separated header file that
conforms the standards and therefore is suitable for inclusion by glibc.
v2:
- rename dedicated file to 'rename-flags.h', as requested by Florian.
Signed-off-by: Yury Norov <[email protected]>
---
include/uapi/linux/fs.h | 4 +---
include/uapi/linux/rename-flags.h | 12 ++++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 include/uapi/linux/rename-flags.h
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index 73e01918f996..34c308203746 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -39,9 +39,7 @@
#define SEEK_HOLE 4 /* seek to the next hole */
#define SEEK_MAX SEEK_HOLE
-#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
-#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
-#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
+#include <linux/rename-flags.h>
struct file_clone_range {
__s64 src_fd;
diff --git a/include/uapi/linux/rename-flags.h b/include/uapi/linux/rename-flags.h
new file mode 100644
index 000000000000..7178f0565657
--- /dev/null
+++ b/include/uapi/linux/rename-flags.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_RENAME_FLAGS_H
+#define _UAPI_LINUX_RENAME_FLAGS_H
+
+/*
+ * Definitions for rename syscall family.
+ */
+#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
+#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
+#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
+
+#endif /* _UAPI_LINUX_RENAME_FLAGS_H */
--
2.17.1
Ping?
On Wed, Nov 14, 2018 at 07:26:07AM +0000, Yury Norov wrote:
> Hi all,
>
> It seems that I forgot to rename guards in v2. This is the correct
> version. My apologize for noise.
>
> Yury
>
> >From 61215b1cb559e69fb57f2a82864e72e3a1ef4b12 Mon Sep 17 00:00:00 2001
> From: Yury Norov <[email protected]>
> Date: Wed, 14 Nov 2018 09:51:49 +0300
> To: Andrew Morton <[email protected]>,
> Alexander Viro <[email protected]>,
> Florian Weimer <[email protected]>
> CC: [email protected], [email protected],
> [email protected], [email protected]
> Subject: [PATCH v2] UAPI: move RENAME_* definitions to separated file
>
> Discussion:
> https://lore.kernel.org/lkml/20180702084622.GA15274@yury-thinkpad/
>
> Although RENAME_* macros are exposed in kernel headers, they are not
> used by glibc. That's because linux/fs.h which hosts RENAME_* is
> considered unsuitable by glibc developers:
>
> As Florian Weimer wrote:
>
> > <linux/fs.h> undefines and defines macros not mentioned in the standards
> > (and it even contains a few unrelated structs), so we cannot include it
> > without _GNU_SOURCE.
> >
> > It might be possible to include it only for _GNU_SOURCE, but there are a
> > lot of things in <linux/fs.h>, so that does not seem to be particularly
> > advisable.
>
> In this patch RENAME_* is removed to a separated header file that
> conforms the standards and therefore is suitable for inclusion by glibc.
>
> v2:
> - rename dedicated file to 'rename-flags.h', as requested by Florian.
>
> Signed-off-by: Yury Norov <[email protected]>
> ---
> include/uapi/linux/fs.h | 4 +---
> include/uapi/linux/rename-flags.h | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 3 deletions(-)
> create mode 100644 include/uapi/linux/rename-flags.h
>
> diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
> index 73e01918f996..34c308203746 100644
> --- a/include/uapi/linux/fs.h
> +++ b/include/uapi/linux/fs.h
> @@ -39,9 +39,7 @@
> #define SEEK_HOLE 4 /* seek to the next hole */
> #define SEEK_MAX SEEK_HOLE
>
> -#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
> -#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
> -#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
> +#include <linux/rename-flags.h>
>
> struct file_clone_range {
> __s64 src_fd;
> diff --git a/include/uapi/linux/rename-flags.h b/include/uapi/linux/rename-flags.h
> new file mode 100644
> index 000000000000..7178f0565657
> --- /dev/null
> +++ b/include/uapi/linux/rename-flags.h
> @@ -0,0 +1,12 @@
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> +#ifndef _UAPI_LINUX_RENAME_FLAGS_H
> +#define _UAPI_LINUX_RENAME_FLAGS_H
> +
> +/*
> + * Definitions for rename syscall family.
> + */
> +#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
> +#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
> +#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
> +
> +#endif /* _UAPI_LINUX_RENAME_FLAGS_H */
> --
> 2.17.1