mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-19 21:21:09 +00:00
namespaces: move the UTS namespace under UTS_NS option
Currently all the namespace management code is in the kernel/utsname.c file, so just compile it out and make stubs in the appropriate header. The init namespace itself is in init/version.c and is in the kernel all the time. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: Cedric Le Goater <clg@fr.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Kirill Korotaev <dev@sw.ru> Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c5289a6949
commit
58bfdd6dee
3 changed files with 30 additions and 1 deletions
|
@ -35,6 +35,7 @@ struct new_utsname {
|
|||
#include <linux/sched.h>
|
||||
#include <linux/kref.h>
|
||||
#include <linux/nsproxy.h>
|
||||
#include <linux/err.h>
|
||||
#include <asm/atomic.h>
|
||||
|
||||
struct uts_namespace {
|
||||
|
@ -43,6 +44,7 @@ struct uts_namespace {
|
|||
};
|
||||
extern struct uts_namespace init_uts_ns;
|
||||
|
||||
#ifdef CONFIG_UTS_NS
|
||||
static inline void get_uts_ns(struct uts_namespace *ns)
|
||||
{
|
||||
kref_get(&ns->kref);
|
||||
|
@ -56,6 +58,25 @@ static inline void put_uts_ns(struct uts_namespace *ns)
|
|||
{
|
||||
kref_put(&ns->kref, free_uts_ns);
|
||||
}
|
||||
#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 uts_namespace *ns)
|
||||
{
|
||||
if (flags & CLONE_NEWUTS)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
return ns;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline struct new_utsname *utsname(void)
|
||||
{
|
||||
return ¤t->nsproxy->uts_ns->name;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue