2023-05-29 07:16:03

by Lu Hongfei

[permalink] [raw]
Subject: [PATCH] ext4: Fix traditional comparison using max/min method

It would be better to replace the traditional ternary conditional
operator with max()/min()

Signed-off-by: Lu Hongfei <[email protected]>
---
fs/ext4/balloc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
mode change 100644 => 100755 fs/ext4/balloc.c

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index c1edde817be8..82124045d187
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -111,10 +111,8 @@ static unsigned ext4_num_overhead_clusters(struct super_block *sb,
itbl_blk_start = ext4_inode_table(sb, gdp);
itbl_blk_end = itbl_blk_start + sbi->s_itb_per_group - 1;
if (itbl_blk_start <= end && itbl_blk_end >= start) {
- itbl_blk_start = itbl_blk_start >= start ?
- itbl_blk_start : start;
- itbl_blk_end = itbl_blk_end <= end ?
- itbl_blk_end : end;
+ itbl_blk_start = max(itbl_blk_start, start);
+ itbl_blk_end = min(itbl_blk_end, end);

itbl_cluster_start = EXT4_B2C(sbi, itbl_blk_start - start);
itbl_cluster_end = EXT4_B2C(sbi, itbl_blk_end - start);
--
2.39.0



2023-06-08 16:22:13

by Jan Kara

[permalink] [raw]
Subject: Re: [PATCH] ext4: Fix traditional comparison using max/min method

On Mon 29-05-23 15:09:30, Lu Hongfei wrote:
> It would be better to replace the traditional ternary conditional
> operator with max()/min()
>
> Signed-off-by: Lu Hongfei <[email protected]>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/ext4/balloc.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
> mode change 100644 => 100755 fs/ext4/balloc.c
>
> diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
> index c1edde817be8..82124045d187
> --- a/fs/ext4/balloc.c
> +++ b/fs/ext4/balloc.c
> @@ -111,10 +111,8 @@ static unsigned ext4_num_overhead_clusters(struct super_block *sb,
> itbl_blk_start = ext4_inode_table(sb, gdp);
> itbl_blk_end = itbl_blk_start + sbi->s_itb_per_group - 1;
> if (itbl_blk_start <= end && itbl_blk_end >= start) {
> - itbl_blk_start = itbl_blk_start >= start ?
> - itbl_blk_start : start;
> - itbl_blk_end = itbl_blk_end <= end ?
> - itbl_blk_end : end;
> + itbl_blk_start = max(itbl_blk_start, start);
> + itbl_blk_end = min(itbl_blk_end, end);
>
> itbl_cluster_start = EXT4_B2C(sbi, itbl_blk_start - start);
> itbl_cluster_end = EXT4_B2C(sbi, itbl_blk_end - start);
> --
> 2.39.0
>
--
Jan Kara <[email protected]>
SUSE Labs, CR

2023-10-06 18:07:16

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH] ext4: Fix traditional comparison using max/min method


On Mon, 29 May 2023 15:09:30 +0800, Lu Hongfei wrote:
> It would be better to replace the traditional ternary conditional
> operator with max()/min()
>
>

Applied, thanks!

[1/1] ext4: Fix traditional comparison using max/min method
commit: a8c1eb77edfc92a64788dad70fedf9277cbafe76

Best regards,
--
Theodore Ts'o <[email protected]>