Unverified Commit 93f67a7d authored by Christian Brauner's avatar Christian Brauner
Browse files

uts: split namespace into separate header 



We have dedicated headers for all namespace types. Add one for the uts
namespace as well. Now it's consistent for all namespace types.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 3ab378cf

include/linux/uts_namespace.h

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/* 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 */

include/linux/utsname.h

+1 −57
Original line number Diff line number Diff line
@@ -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