summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Su <sh_def@163.com>2020-11-16 02:00:54 +0800
committerChristian Brauner <christian.brauner@ubuntu.com>2020-11-19 10:57:02 +0100
commitaabe19b8279340c43294688b4d9527a893c60463 (patch)
tree06b0cdf4c2d11b10d38d620989a40a4f529a7daa
parentbda4c60d02e9ceeee726f73250b808fad0663dd6 (diff)
nsproxy: use put_nsproxy() in switch_task_namespaces()
We already have a dedicated helper that handles reference count checking so stop open-coding the reference count check in switch_task_namespaces() and use the dedicated put_nsproxy() helper instead. Take the change to fix a whitespace issue too. Signed-off-by: Hui Su <sh_def@163.com> [christian.brauner@ubuntu.com: expand commit message] Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Link: https://lore.kernel.org/r/20201115180054.GA371317@rlk Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
-rw-r--r--kernel/nsproxy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 12dd41b39a7f..3ebfd090398a 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -173,7 +173,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);
@@ -250,8 +250,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)