summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiapeng Zhong <abaci-bugfix@linux.alibaba.com>2021-02-24 23:07:09 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-25 00:38:32 +0300
commitc93b0a99260741a4fe39c0a8b73f45f34a5b7868 (patch)
treef4f658b751d1aebc7b586a8821b9c74163081d3d
parent1d88433bb00853bed0c776b6ad9156855c127da0 (diff)
downloadlinux-c93b0a99260741a4fe39c0a8b73f45f34a5b7868.tar.xz
mm/hugetlb: simplify the calculation of variables
Fix the following coccicheck warnings: mm/hugetlb.c:3372:20-22: WARNING !A || A && B is equivalent to !A || B. Link: https://lkml.kernel.org/r/1611643468-52233-1-git-send-email-abaci-bugfix@linux.alibaba.com Signed-off-by: Jiapeng Zhong <abaci-bugfix@linux.alibaba.com> Reported-by: Abaci Robot <abaci@linux.alibaba.com> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/hugetlb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index e8d39b0fe4bd..6920c71d7e0d 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3420,8 +3420,7 @@ static unsigned int allowed_mems_nr(struct hstate *h)
mpol_allowed = policy_nodemask_current(gfp_mask);
for_each_node_mask(node, cpuset_current_mems_allowed) {
- if (!mpol_allowed ||
- (mpol_allowed && node_isset(node, *mpol_allowed)))
+ if (!mpol_allowed || node_isset(node, *mpol_allowed))
nr += array[node];
}