Merge tag 'core-entry-2020-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index e2e6c5d..abc01fc 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -172,7 +172,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
         * it along with CLONE_NEWIPC.
         */
        if ((flags & (CLONE_NEWIPC | CLONE_SYSVSEM)) ==
-               (CLONE_NEWIPC | CLONE_SYSVSEM)) 
+               (CLONE_NEWIPC | CLONE_SYSVSEM))
                return -EINVAL;
 
        new_ns = create_new_namespaces(flags, tsk, user_ns, tsk->fs);
@@ -245,8 +245,8 @@ void switch_task_namespaces(struct task_struct *p, struct nsproxy *new)
        p->nsproxy = new;
        task_unlock(p);
 
-       if (ns && atomic_dec_and_test(&ns->count))
-               free_nsproxy(ns);
+       if (ns)
+               put_nsproxy(ns);
 }
 
 void exit_task_namespaces(struct task_struct *p)