Unverified Commit e3e1812f authored by Christian Brauner's avatar Christian Brauner
Browse files

ns: move to_ns_common() to ns_common.h 



Move the helper to ns_common.h where it belongs.

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

include/linux/ns_common.h

+20 −0
Original line number Diff line number Diff line
@@ -6,6 +6,15 @@ 


struct proc_ns_operations;



struct cgroup_namespace;

struct ipc_namespace;

struct mnt_namespace;

struct net;

struct pid_namespace;

struct time_namespace;

struct user_namespace;

struct uts_namespace;



struct ns_common {

	struct dentry *stashed;

	const struct proc_ns_operations *ops;
@@ -13,4 +22,15 @@ struct ns_common { 
	refcount_t count;

};



#define to_ns_common(__ns)                              \

	_Generic((__ns),                                \

		struct cgroup_namespace *: &(__ns)->ns, \

		struct ipc_namespace *:    &(__ns)->ns, \

		struct mnt_namespace *:    &(__ns)->ns, \

		struct net *:              &(__ns)->ns, \

		struct pid_namespace *:    &(__ns)->ns, \

		struct time_namespace *:   &(__ns)->ns, \

		struct user_namespace *:   &(__ns)->ns, \

		struct uts_namespace *:    &(__ns)->ns)



#endif

include/linux/nsproxy.h

+0 −11
Original line number Diff line number Diff line
@@ -42,17 +42,6 @@ struct nsproxy { 
};

extern struct nsproxy init_nsproxy;



#define to_ns_common(__ns)                              \

	_Generic((__ns),                                \

		struct cgroup_namespace *: &(__ns->ns), \

		struct ipc_namespace *:    &(__ns->ns), \

		struct net *:              &(__ns->ns), \

		struct pid_namespace *:    &(__ns->ns), \

		struct mnt_namespace *:    &(__ns->ns), \

		struct time_namespace *:   &(__ns->ns), \

		struct user_namespace *:   &(__ns->ns), \

		struct uts_namespace *:    &(__ns->ns))



/*

 * A structure to encompass all bits needed to install

 * a partial or complete new set of namespaces.