Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 7b05bce75cde28ff75b423157c165a8150858329..f5b9ee6f6bbb02733cef1e64fabe4dc521efc767 100644 (file)
--- 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)