perf events: Allow per-task-per-cpu counters

[safe/jmp/linux-2.6] / kernel / pid_namespace.c

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 495d5de..86b3796 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
 
 struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
 {
-       struct pid_namespace *new_ns;
-
-       BUG_ON(!old_ns);
-       new_ns = get_pid_ns(old_ns);
        if (!(flags & CLONE_NEWPID))
-               goto out;
-
-       new_ns = ERR_PTR(-EINVAL);
-       if (flags & CLONE_THREAD)
-               goto out_put;
-
-       new_ns = create_pid_namespace(old_ns);
-
-out_put:
-       put_pid_ns(old_ns);
-out:
-       return new_ns;
+               return get_pid_ns(old_ns);
+       if (flags & (CLONE_THREAD|CLONE_PARENT))
+               return ERR_PTR(-EINVAL);
+       return create_pid_namespace(old_ns);
 }
 
 void free_pid_ns(struct kref *kref)