From: Raphael S.Carvalho <raphael.scarv@gmail.com>
Date: Wed, 27 Feb 2013 18:32:09 +0000 (-0300)
Subject: kernel/nsproxy.c: Improving a snippet of code.
X-Git-Tag: v4.13~8831^2~9
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=21e851943e31022731cd5fad386ca8fb552dbe64;p=mirror_ubuntu-bionic-kernel.git

kernel/nsproxy.c: Improving a snippet of code.

It seems GCC generates a better code in that way, so I changed that statement.
Btw, they have the same semantic, so I'm sending this patch due to performance issues.

Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Raphael S.Carvalho <raphael.scarv@gmail.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 364ceab15f0c..d9afd256318f 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -148,7 +148,8 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
 	 * means share undolist with parent, so we must forbid using
 	 * it along with CLONE_NEWIPC.
 	 */
-	if ((flags & CLONE_NEWIPC) && (flags & CLONE_SYSVSEM)) {
+	if ((flags & (CLONE_NEWIPC | CLONE_SYSVSEM)) ==
+		(CLONE_NEWIPC | CLONE_SYSVSEM)) {
 		err = -EINVAL;
 		goto out;
 	}