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/user_namespace.h | |
| parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) | |
| download | op-kernel-dev-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.zip op-kernel-dev-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.gz | |
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/user_namespace.h')
| -rw-r--r-- | include/linux/user_namespace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index e953726..4cf06c1 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -3,6 +3,7 @@ #include <linux/kref.h> #include <linux/nsproxy.h> +#include <linux/ns_common.h> #include <linux/sched.h> #include <linux/err.h> @@ -26,7 +27,7 @@ struct user_namespace { int level; kuid_t owner; kgid_t group; - unsigned int proc_inum; + struct ns_common ns; /* Register of per-UID persistent keyrings for this namespace */ #ifdef CONFIG_PERSISTENT_KEYRINGS |
