[PATCH] namespaces: utsname: implement utsname namespaces
This patch defines the uts namespace and some manipulators. Adds the uts namespace to task_struct, and initializes a system-wide init namespace. It leaves a #define for system_utsname so sysctl will compile. This define will be removed in a separate patch. [akpm@osdl.org: build fix, cleanup] Signed-off-by: Serge Hallyn <serue@us.ibm.com> Cc: Kirill Korotaev <dev@openvz.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Andrey Savochkin <saw@sw.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
96b644bdec
commit
4865ecf131
@@ -1,6 +1,11 @@
|
||||
#ifndef _LINUX_UTSNAME_H
|
||||
#define _LINUX_UTSNAME_H
|
||||
|
||||
#include <linux/sched.h>
|
||||
#include <linux/kref.h>
|
||||
#include <linux/nsproxy.h>
|
||||
#include <asm/atomic.h>
|
||||
|
||||
#define __OLD_UTS_LEN 8
|
||||
|
||||
struct oldold_utsname {
|
||||
@@ -30,17 +35,46 @@ struct new_utsname {
|
||||
char domainname[65];
|
||||
};
|
||||
|
||||
extern struct new_utsname system_utsname;
|
||||
struct uts_namespace {
|
||||
struct kref kref;
|
||||
struct new_utsname name;
|
||||
};
|
||||
extern struct uts_namespace init_uts_ns;
|
||||
|
||||
static inline void get_uts_ns(struct uts_namespace *ns)
|
||||
{
|
||||
kref_get(&ns->kref);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_UTS_NS
|
||||
extern int copy_utsname(int flags, struct task_struct *tsk);
|
||||
extern void free_uts_ns(struct kref *kref);
|
||||
|
||||
static inline void put_uts_ns(struct uts_namespace *ns)
|
||||
{
|
||||
kref_put(&ns->kref, free_uts_ns);
|
||||
}
|
||||
#else
|
||||
static inline int copy_utsname(int flags, struct task_struct *tsk)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline void put_uts_ns(struct uts_namespace *ns)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline struct new_utsname *utsname(void)
|
||||
{
|
||||
return &system_utsname;
|
||||
return ¤t->nsproxy->uts_ns->name;
|
||||
}
|
||||
|
||||
static inline struct new_utsname *init_utsname(void)
|
||||
{
|
||||
return &system_utsname;
|
||||
return &init_uts_ns.name;
|
||||
}
|
||||
|
||||
#define system_utsname init_uts_ns.name
|
||||
|
||||
extern struct rw_semaphore uts_sem;
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user