X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fnsproxy.c;h=f5b9ee6f6bbb02733cef1e64fabe4dc521efc767;hb=0a7b35cb18c52d651f6ed9cd59edc979200ab880;hp=7b05bce75cde28ff75b423157c165a8150858329;hpb=d3143e71a95fe504c3d2d4a3b7aac126a588b1ac;p=powerpc.git

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 7b05bce75c..f5b9ee6f6b 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)