summaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorRaphael S.Carvalho <raphael.scarv@gmail.com>2013-02-27 19:32:09 +0100
committerEric W. Biederman <ebiederm@xmission.com>2013-08-27 02:45:56 +0200
commit21e851943e31022731cd5fad386ca8fb552dbe64 (patch)
tree53509f2b4aa5ec07fb89d616880b0d78b1555242 /kernel/nsproxy.c
parentproc: Restrict mounting the proc filesystem (diff)
downloadlinux-21e851943e31022731cd5fad386ca8fb552dbe64.tar.xz
linux-21e851943e31022731cd5fad386ca8fb552dbe64.zip
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>
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c3
1 files changed, 2 insertions, 1 deletions
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;
}