git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge sys_clone()/sys_unshare() nsproxy and namespace handling
[safe/jmp/linux-2.6]
/
include
/
linux
/
utsname.h
diff --git
a/include/linux/utsname.h
b/include/linux/utsname.h
index
99e5223
..
f8d3b32
100644
(file)
--- a/
include/linux/utsname.h
+++ b/
include/linux/utsname.h
@@
-1,11
+1,6
@@
#ifndef _LINUX_UTSNAME_H
#define _LINUX_UTSNAME_H
#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 {
#define __OLD_UTS_LEN 8
struct oldold_utsname {
@@
-35,6
+30,13
@@
struct new_utsname {
char domainname[65];
};
char domainname[65];
};
+#ifdef __KERNEL__
+
+#include <linux/sched.h>
+#include <linux/kref.h>
+#include <linux/nsproxy.h>
+#include <asm/atomic.h>
+
struct uts_namespace {
struct kref kref;
struct new_utsname name;
struct uts_namespace {
struct kref kref;
struct new_utsname name;
@@
-47,7
+49,7
@@
static inline void get_uts_ns(struct uts_namespace *ns)
}
#ifdef CONFIG_UTS_NS
}
#ifdef CONFIG_UTS_NS
-extern
int copy_utsname(int flags, struct task_struct *tsk
);
+extern
struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns
);
extern void free_uts_ns(struct kref *kref);
static inline void put_uts_ns(struct uts_namespace *ns)
extern void free_uts_ns(struct kref *kref);
static inline void put_uts_ns(struct uts_namespace *ns)
@@
-55,10
+57,12
@@
static inline void put_uts_ns(struct uts_namespace *ns)
kref_put(&ns->kref, free_uts_ns);
}
#else
kref_put(&ns->kref, free_uts_ns);
}
#else
-static inline int copy_utsname(int flags, struct task_struct *tsk)
+static inline struct uts_namespace *copy_utsname(int flags,
+ struct uts_namespace *ns)
{
{
- return
0
;
+ return
ns
;
}
}
+
static inline void put_uts_ns(struct uts_namespace *ns)
{
}
static inline void put_uts_ns(struct uts_namespace *ns)
{
}
@@
-75,4
+79,7
@@
static inline struct new_utsname *init_utsname(void)
}
extern struct rw_semaphore uts_sem;
}
extern struct rw_semaphore uts_sem;
-#endif
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_UTSNAME_H */