summaryrefslogtreecommitdiffstats
path: root/kernel/user.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-10-31 22:56:04 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 14:31:00 -0500
commit435d5f4bb2ccba3b791d9ef61d2590e30b8e806e (patch)
treed482ef15334a703bbe406dab021880ce3d320870 /kernel/user.c
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
downloadlinux-stable-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.gz
linux-stable-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.bz2
linux-stable-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.zip
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 'kernel/user.c')
-rw-r--r--kernel/user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/user.c b/kernel/user.c
index 4efa39350e44..a7ca84bad8e6 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -50,7 +50,7 @@ struct user_namespace init_user_ns = {
.count = ATOMIC_INIT(3),
.owner = GLOBAL_ROOT_UID,
.group = GLOBAL_ROOT_GID,
- .proc_inum = PROC_USER_INIT_INO,
+ .ns.inum = PROC_USER_INIT_INO,
#ifdef CONFIG_PERSISTENT_KEYRINGS
.persistent_keyring_register_sem =
__RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),