ext4: Simplify if condition

[PATCH -next] ext4: Simplify if condition

Posted by Jiapeng Chong 1 year, 5 months ago

The if condition !A || A && B can be simplified to !A || B.

./fs/ext4/fast_commit.c:362:21-23: WARNING !A || A && B is equivalent to !A || B.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9837
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/ext4/fast_commit.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index 326c16a4e51e..53a77172dc9f 100644
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -357,9 +357,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
 	}
 	spin_lock(&sbi->s_fc_lock);
 	is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
-	if (has_transaction &&
-	    (!is_ineligible ||
-	     (is_ineligible && tid_gt(tid, sbi->s_fc_ineligible_tid))))
+	if (has_transaction && (!is_ineligible || tid_gt(tid, sbi->s_fc_ineligible_tid)))
 		sbi->s_fc_ineligible_tid = tid;
 	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
 	spin_unlock(&sbi->s_fc_lock);
-- 
2.32.0.3.g01195cf9f

Re: [PATCH -next] ext4: Simplify if condition

Posted by Theodore Ts'o 1 year, 3 months ago

On Fri, 30 Aug 2024 15:17:13 +0800, Jiapeng Chong wrote:
> The if condition !A || A && B can be simplified to !A || B.
> 
> ./fs/ext4/fast_commit.c:362:21-23: WARNING !A || A && B is equivalent to !A || B.
> 
> 

Applied, thanks!

[1/1] ext4: Simplify if condition
      commit: 296eb810fa1f346f3a1eae46504459a3f81126dc

Best regards,
-- 
Theodore Ts'o <tytso@mit.edu>

Re: [PATCH -next] ext4: Simplify if condition

Posted by Jan Kara 1 year, 4 months ago

On Fri 30-08-24 15:17:13, Jiapeng Chong wrote:
> The if condition !A || A && B can be simplified to !A || B.
> 
> ./fs/ext4/fast_commit.c:362:21-23: WARNING !A || A && B is equivalent to !A || B.
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9837
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/ext4/fast_commit.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
> index 326c16a4e51e..53a77172dc9f 100644
> --- a/fs/ext4/fast_commit.c
> +++ b/fs/ext4/fast_commit.c
> @@ -357,9 +357,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
>  	}
>  	spin_lock(&sbi->s_fc_lock);
>  	is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
> -	if (has_transaction &&
> -	    (!is_ineligible ||
> -	     (is_ineligible && tid_gt(tid, sbi->s_fc_ineligible_tid))))
> +	if (has_transaction && (!is_ineligible || tid_gt(tid, sbi->s_fc_ineligible_tid)))
>  		sbi->s_fc_ineligible_tid = tid;
>  	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
>  	spin_unlock(&sbi->s_fc_lock);
> -- 
> 2.32.0.3.g01195cf9f
> 
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR