Commit dca4a979 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

pidns: rewrite copy_pid_ns()

copy_pid_ns() is a perfect example of a case where unwinding leads to more
code and makes it less clear.  Watch the diffstat.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Reviewed-by: default avatarSerge Hallyn <serue@us.ibm.com>
Acked-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Reviewed-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ed469a63
......@@ -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);
return get_pid_ns(old_ns);
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 ERR_PTR(-EINVAL);
return create_pid_namespace(old_ns);
}
void free_pid_ns(struct kref *kref)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment