Revert "[PATCH] namespaces: fix exit race by splitting exit"

This reverts commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5 in
preparation for a better and simpler fix proposed by Eric Biederman
(and fixed up by Serge Hallyn)

Acked-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 15 deletions

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 7b05bce75cde..f5b9ee6f6bbb 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -117,7 +117,7 @@ int copy_namespaces(int flags, struct task_struct *tsk)
                 goto out_pid;
 
 out:
-        put_and_finalize_nsproxy(old_ns);
+        put_nsproxy(old_ns);
         return err;
 
 out_pid:
@@ -135,20 +135,6 @@ out_ns:
         goto out;
 }
 
-struct nsproxy *put_nsproxy(struct nsproxy *ns)
-{
-        if (ns) {
-                if (atomic_dec_and_test(&ns->count)) {
-                        if (ns->mnt_ns) {
-                                put_mnt_ns(ns->mnt_ns);
-                                ns->mnt_ns = NULL;
-                        }
-                        return ns;
-                }
-        }
-        return NULL;
-}
-
 void free_nsproxy(struct nsproxy *ns)
 {
         if (ns->mnt_ns)