diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-31 22:56:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-04 14:31:00 -0500 |
commit | 435d5f4bb2ccba3b791d9ef61d2590e30b8e806e (patch) | |
tree | d482ef15334a703bbe406dab021880ce3d320870 /include/linux/utsname.h | |
parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) |
common object embedded into various struct ....ns
for now - just move corresponding ->proc_inum instances over there
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/utsname.h')
-rw-r--r-- | include/linux/utsname.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/utsname.h b/include/linux/utsname.h index 239e27733d6c..5093f58ae192 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
6 | #include <linux/kref.h> | 6 | #include <linux/kref.h> |
7 | #include <linux/nsproxy.h> | 7 | #include <linux/nsproxy.h> |
8 | #include <linux/ns_common.h> | ||
8 | #include <linux/err.h> | 9 | #include <linux/err.h> |
9 | #include <uapi/linux/utsname.h> | 10 | #include <uapi/linux/utsname.h> |
10 | 11 | ||
@@ -23,7 +24,7 @@ struct uts_namespace { | |||
23 | struct kref kref; | 24 | struct kref kref; |
24 | struct new_utsname name; | 25 | struct new_utsname name; |
25 | struct user_namespace *user_ns; | 26 | struct user_namespace *user_ns; |
26 | unsigned int proc_inum; | 27 | struct ns_common ns; |
27 | }; | 28 | }; |
28 | extern struct uts_namespace init_uts_ns; | 29 | extern struct uts_namespace init_uts_ns; |
29 | 30 | ||