summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-01 02:32:53 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 14:34:47 -0500
commit33c429405a2c8d9e42afb9fee88a63cfb2de1e98 (patch)
treed2ffe096cd36852049b844c8befd1ba0ba6cf18c /ipc
parent6344c433a452b1a05d03a61a6a85d89f793bb7b8 (diff)
downloadlinux-stable-33c429405a2c8d9e42afb9fee88a63cfb2de1e98.tar.gz
linux-stable-33c429405a2c8d9e42afb9fee88a63cfb2de1e98.tar.bz2
linux-stable-33c429405a2c8d9e42afb9fee88a63cfb2de1e98.zip
copy address of proc_ns_ops into ns_common
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/msgutil.c3
-rw-r--r--ipc/namespace.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 5930471a2902..2b491590ebab 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -32,6 +32,9 @@ struct ipc_namespace init_ipc_ns = {
.count = ATOMIC_INIT(1),
.user_ns = &init_user_ns,
.ns.inum = PROC_IPC_INIT_INO,
+#ifdef CONFIG_IPC_NS
+ .ns.ops = &ipcns_operations,
+#endif
};
atomic_t nr_ipc_ns = ATOMIC_INIT(1);
diff --git a/ipc/namespace.c b/ipc/namespace.c
index bcdd7a5c122a..382e2aa42d8a 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -31,6 +31,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
kfree(ns);
return ERR_PTR(err);
}
+ ns->ns.ops = &ipcns_operations;
atomic_set(&ns->count, 1);
err = mq_init_ns(ns);