The patch titled pidns: rewrite copy_pid_ns() has been added to the -mm tree. Its filename is pidns-rewrite-copy_pid_ns.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pidns: rewrite copy_pid_ns() From: Alexey Dobriyan <adobriyan@xxxxxxxxx> 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: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: Serge Hallyn <serue@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/pid_namespace.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff -puN kernel/pid_namespace.c~pidns-rewrite-copy_pid_ns kernel/pid_namespace.c --- a/kernel/pid_namespace.c~pidns-rewrite-copy_pid_ns +++ a/kernel/pid_namespace.c @@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct 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) _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are origin.patch fs-remove-sparse-errors-in-proc_devtreec.patch procfs-make-errno-values-consistent-when-open-pident-vs-exit2-race-occurs.patch mm-consolidate-init_mm-definition.patch mm-consolidate-init_mm-definition-fix.patch pagemap-document-clarifications.patch pagemap-documentation-9-more-exported-page-flags.patch mm-introduce-pagehuge-for-testing-huge-gigantic-pages.patch proc-kpagecount-kpageflags-code-cleanup.patch proc-export-more-page-flags-in-proc-kpageflags.patch softirq-introduce-statistics-for-softirq.patch proc-export-statistics-for-softirq-to-proc.patch proc-update-document-for-proc-softirqs-and-proc-stat.patch pidns-make-create_pid_namespace-accept-parent-pidns.patch pidns-rewrite-copy_pid_ns.patch utsns-extract-creeate_uts_ns.patch ipcns-remove-useless-get-put-while-clone_newipc.patch ipcns-extract-create_ipc_ns.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html