1. Patchew
  2. linux
  3. [PATCH 0/9] ns: rework common initialization
  4. View patch

[PATCH 1/9] uts: split namespace into separate header

Christian Brauner posted 9 patches 2 weeks, 1 day ago
[PATCH 1/9] uts: split namespace into separate header
Posted by Christian Brauner 2 weeks, 1 day ago 
We have dedicated headers for all namespace types. Add one for the uts
namespace as well. Now it's consistent for all namespace types.

Signed-off-by: Christian Brauner <brauner@kernel.org>
---
 include/linux/uts_namespace.h | 65 +++++++++++++++++++++++++++++++++++++++++++
 include/linux/utsname.h       | 58 +-------------------------------------
 2 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/include/linux/uts_namespace.h b/include/linux/uts_namespace.h
new file mode 100644
index 000000000000..c2b619bb4e57
--- /dev/null
+++ b/include/linux/uts_namespace.h
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_UTS_NAMESPACE_H
+#define _LINUX_UTS_NAMESPACE_H
+
+#include <linux/ns_common.h>
+#include <uapi/linux/utsname.h>
+
+struct user_namespace;
+extern struct user_namespace init_user_ns;
+
+struct uts_namespace {
+	struct new_utsname name;
+	struct user_namespace *user_ns;
+	struct ucounts *ucounts;
+	struct ns_common ns;
+} __randomize_layout;
+
+extern struct uts_namespace init_uts_ns;
+
+#ifdef CONFIG_UTS_NS
+static inline struct uts_namespace *to_uts_ns(struct ns_common *ns)
+{
+	return container_of(ns, struct uts_namespace, ns);
+}
+
+static inline void get_uts_ns(struct uts_namespace *ns)
+{
+	refcount_inc(&ns->ns.count);
+}
+
+extern struct uts_namespace *copy_utsname(unsigned long flags,
+	struct user_namespace *user_ns, struct uts_namespace *old_ns);
+extern void free_uts_ns(struct uts_namespace *ns);
+
+static inline void put_uts_ns(struct uts_namespace *ns)
+{
+	if (refcount_dec_and_test(&ns->ns.count))
+		free_uts_ns(ns);
+}
+
+void uts_ns_init(void);
+#else
+static inline void get_uts_ns(struct uts_namespace *ns)
+{
+}
+
+static inline void put_uts_ns(struct uts_namespace *ns)
+{
+}
+
+static inline struct uts_namespace *copy_utsname(unsigned long flags,
+	struct user_namespace *user_ns, struct uts_namespace *old_ns)
+{
+	if (flags & CLONE_NEWUTS)
+		return ERR_PTR(-EINVAL);
+
+	return old_ns;
+}
+
+static inline void uts_ns_init(void)
+{
+}
+#endif
+
+#endif /* _LINUX_UTS_NAMESPACE_H */
diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index 5d34c4f0f945..547bd4439706 100644
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -7,7 +7,7 @@
 #include <linux/nsproxy.h>
 #include <linux/ns_common.h>
 #include <linux/err.h>
-#include <uapi/linux/utsname.h>
+#include <linux/uts_namespace.h>
 
 enum uts_proc {
 	UTS_PROC_ARCH,
@@ -18,62 +18,6 @@ enum uts_proc {
 	UTS_PROC_DOMAINNAME,
 };
 
-struct user_namespace;
-extern struct user_namespace init_user_ns;
-
-struct uts_namespace {
-	struct new_utsname name;
-	struct user_namespace *user_ns;
-	struct ucounts *ucounts;
-	struct ns_common ns;
-} __randomize_layout;
-extern struct uts_namespace init_uts_ns;
-
-#ifdef CONFIG_UTS_NS
-static inline struct uts_namespace *to_uts_ns(struct ns_common *ns)
-{
-	return container_of(ns, struct uts_namespace, ns);
-}
-
-static inline void get_uts_ns(struct uts_namespace *ns)
-{
-	refcount_inc(&ns->ns.count);
-}
-
-extern struct uts_namespace *copy_utsname(unsigned long flags,
-	struct user_namespace *user_ns, struct uts_namespace *old_ns);
-extern void free_uts_ns(struct uts_namespace *ns);
-
-static inline void put_uts_ns(struct uts_namespace *ns)
-{
-	if (refcount_dec_and_test(&ns->ns.count))
-		free_uts_ns(ns);
-}
-
-void uts_ns_init(void);
-#else
-static inline void get_uts_ns(struct uts_namespace *ns)
-{
-}
-
-static inline void put_uts_ns(struct uts_namespace *ns)
-{
-}
-
-static inline struct uts_namespace *copy_utsname(unsigned long flags,
-	struct user_namespace *user_ns, struct uts_namespace *old_ns)
-{
-	if (flags & CLONE_NEWUTS)
-		return ERR_PTR(-EINVAL);
-
-	return old_ns;
-}
-
-static inline void uts_ns_init(void)
-{
-}
-#endif
-
 #ifdef CONFIG_PROC_SYSCTL
 extern void uts_proc_notify(enum uts_proc proc);
 #else

-- 
2.47.3
Re: [PATCH 1/9] uts: split namespace into separate header
Posted by Jan Kara 2 weeks ago 
On Wed 17-09-25 12:28:00, Christian Brauner wrote:
> We have dedicated headers for all namespace types. Add one for the uts
> namespace as well. Now it's consistent for all namespace types.
> 
> Signed-off-by: Christian Brauner <brauner@kernel.org>

Fine by me. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  include/linux/uts_namespace.h | 65 +++++++++++++++++++++++++++++++++++++++++++
>  include/linux/utsname.h       | 58 +-------------------------------------
>  2 files changed, 66 insertions(+), 57 deletions(-)
> 
> diff --git a/include/linux/uts_namespace.h b/include/linux/uts_namespace.h
> new file mode 100644
> index 000000000000..c2b619bb4e57
> --- /dev/null
> +++ b/include/linux/uts_namespace.h
> @@ -0,0 +1,65 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _LINUX_UTS_NAMESPACE_H
> +#define _LINUX_UTS_NAMESPACE_H
> +
> +#include <linux/ns_common.h>
> +#include <uapi/linux/utsname.h>
> +
> +struct user_namespace;
> +extern struct user_namespace init_user_ns;
> +
> +struct uts_namespace {
> +	struct new_utsname name;
> +	struct user_namespace *user_ns;
> +	struct ucounts *ucounts;
> +	struct ns_common ns;
> +} __randomize_layout;
> +
> +extern struct uts_namespace init_uts_ns;
> +
> +#ifdef CONFIG_UTS_NS
> +static inline struct uts_namespace *to_uts_ns(struct ns_common *ns)
> +{
> +	return container_of(ns, struct uts_namespace, ns);
> +}
> +
> +static inline void get_uts_ns(struct uts_namespace *ns)
> +{
> +	refcount_inc(&ns->ns.count);
> +}
> +
> +extern struct uts_namespace *copy_utsname(unsigned long flags,
> +	struct user_namespace *user_ns, struct uts_namespace *old_ns);
> +extern void free_uts_ns(struct uts_namespace *ns);
> +
> +static inline void put_uts_ns(struct uts_namespace *ns)
> +{
> +	if (refcount_dec_and_test(&ns->ns.count))
> +		free_uts_ns(ns);
> +}
> +
> +void uts_ns_init(void);
> +#else
> +static inline void get_uts_ns(struct uts_namespace *ns)
> +{
> +}
> +
> +static inline void put_uts_ns(struct uts_namespace *ns)
> +{
> +}
> +
> +static inline struct uts_namespace *copy_utsname(unsigned long flags,
> +	struct user_namespace *user_ns, struct uts_namespace *old_ns)
> +{
> +	if (flags & CLONE_NEWUTS)
> +		return ERR_PTR(-EINVAL);
> +
> +	return old_ns;
> +}
> +
> +static inline void uts_ns_init(void)
> +{
> +}
> +#endif
> +
> +#endif /* _LINUX_UTS_NAMESPACE_H */
> diff --git a/include/linux/utsname.h b/include/linux/utsname.h
> index 5d34c4f0f945..547bd4439706 100644
> --- a/include/linux/utsname.h
> +++ b/include/linux/utsname.h
> @@ -7,7 +7,7 @@
>  #include <linux/nsproxy.h>
>  #include <linux/ns_common.h>
>  #include <linux/err.h>
> -#include <uapi/linux/utsname.h>
> +#include <linux/uts_namespace.h>
>  
>  enum uts_proc {
>  	UTS_PROC_ARCH,
> @@ -18,62 +18,6 @@ enum uts_proc {
>  	UTS_PROC_DOMAINNAME,
>  };
>  
> -struct user_namespace;
> -extern struct user_namespace init_user_ns;
> -
> -struct uts_namespace {
> -	struct new_utsname name;
> -	struct user_namespace *user_ns;
> -	struct ucounts *ucounts;
> -	struct ns_common ns;
> -} __randomize_layout;
> -extern struct uts_namespace init_uts_ns;
> -
> -#ifdef CONFIG_UTS_NS
> -static inline struct uts_namespace *to_uts_ns(struct ns_common *ns)
> -{
> -	return container_of(ns, struct uts_namespace, ns);
> -}
> -
> -static inline void get_uts_ns(struct uts_namespace *ns)
> -{
> -	refcount_inc(&ns->ns.count);
> -}
> -
> -extern struct uts_namespace *copy_utsname(unsigned long flags,
> -	struct user_namespace *user_ns, struct uts_namespace *old_ns);
> -extern void free_uts_ns(struct uts_namespace *ns);
> -
> -static inline void put_uts_ns(struct uts_namespace *ns)
> -{
> -	if (refcount_dec_and_test(&ns->ns.count))
> -		free_uts_ns(ns);
> -}
> -
> -void uts_ns_init(void);
> -#else
> -static inline void get_uts_ns(struct uts_namespace *ns)
> -{
> -}
> -
> -static inline void put_uts_ns(struct uts_namespace *ns)
> -{
> -}
> -
> -static inline struct uts_namespace *copy_utsname(unsigned long flags,
> -	struct user_namespace *user_ns, struct uts_namespace *old_ns)
> -{
> -	if (flags & CLONE_NEWUTS)
> -		return ERR_PTR(-EINVAL);
> -
> -	return old_ns;
> -}
> -
> -static inline void uts_ns_init(void)
> -{
> -}
> -#endif
> -
>  #ifdef CONFIG_PROC_SYSCTL
>  extern void uts_proc_notify(enum uts_proc proc);
>  #else
> 
> -- 
> 2.47.3
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.