ipc: Store mqueue sysctls in the ipc namespace

[linux-2.6-block.git] / ipc / namespace.c

diff --git a/ipc/namespace.c b/ipc/namespace.c
index ae83f0f2651b7dad5acb3d7210c8ef47d4cca6a3..f760243ca685c92c5d00ef8a9def825b4af741d4 100644 (file)
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -59,6 +59,10 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
        if (err)
                goto fail_put;
 
+       err = -ENOMEM;
+       if (!setup_mq_sysctls(ns))
+               goto fail_put;
+
        sem_init_ns(ns);
        msg_init_ns(ns);
        shm_init_ns(ns);
@@ -125,6 +129,8 @@ static void free_ipc_ns(struct ipc_namespace *ns)
        msg_exit_ns(ns);
        shm_exit_ns(ns);
 
+       retire_mq_sysctls(ns);
+
        dec_ipc_namespaces(ns->ucounts);
        put_user_ns(ns->user_ns);
        ns_free_inum(&ns->ns);