Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[deliverable/linux.git] / kernel / pid.c

diff --git a/kernel/pid.c b/kernel/pid.c
index 9b9a26698144e126486e162955e49561514b1ce8..cd36a5e0d173062dfbdd557fa7ad5234350af2ed 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -79,7 +79,10 @@ struct pid_namespace init_pid_ns = {
        .level = 0,
        .child_reaper = &init_task,
        .user_ns = &init_user_ns,
-       .proc_inum = PROC_PID_INIT_INO,
+       .ns.inum = PROC_PID_INIT_INO,
+#ifdef CONFIG_PID_NS
+       .ns.ops = &pidns_operations,
+#endif
 };
 EXPORT_SYMBOL_GPL(init_pid_ns);
 
@@ -341,6 +344,8 @@ out:
 
 out_unlock:
        spin_unlock_irq(&pidmap_lock);
+       put_pid_ns(ns);
+
 out_free:
        while (++i <= ns->level)
                free_pidmap(pid->numbers + i);