ocfs2: simplify the calculation of variables
authorJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Wed, 24 Feb 2021 20:00:45 +0000 (12:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 21:38:26 +0000 (13:38 -0800)
Fix the following coccicheck warnings:

  fs/ocfs2/refcounttree.c:981:16-18: WARNING !A || A && B is equivalent to !A || B.

Link: https://lkml.kernel.org/r/1612235424-80367-1-git-send-email-jiapeng.chong@linux.alibaba.com
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/refcounttree.c

index c26937824be155fd586a7babba339deb1d5a5dda..c19a463fac55bf88de71733ecd0a5ea37bcfba05 100644 (file)
@@ -978,7 +978,7 @@ static int ocfs2_get_refcount_cpos_end(struct ocfs2_caching_info *ci,
                return 0;
        }
 
-       if (!eb || (eb && !eb->h_next_leaf_blk)) {
+       if (!eb || !eb->h_next_leaf_blk) {
                /*
                 * We are the last extent rec, so any high cpos should
                 * be stored in this leaf refcount block.