ext4: replace the traditional ternary conditional operator with with max()/min()

[ Upstream commit de8bf0e5ee7482585450357c6d4eddec8efc5cb7 ]

Replace the traditional ternary conditional operator with with max()/min()

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20230801143204.2284343-7-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 016925b1a0908e7bd5c80ae33d8e2a5c8bc1674a..a2c5024943d8235235a324d4d47b3a8769d8890e 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -6430,8 +6430,7 @@ __releases(ext4_group_lock_ptr(sb, e4b->bd_group))
        void *bitmap;
 
        bitmap = e4b->bd_bitmap;
-       start = (e4b->bd_info->bb_first_free > start) ?
-               e4b->bd_info->bb_first_free : start;
+       start = max(e4b->bd_info->bb_first_free, start);
        count = 0;
        free_count = 0;
 
@@ -6648,8 +6647,7 @@ ext4_mballoc_query_range(
 
        ext4_lock_group(sb, group);
 
-       start = (e4b.bd_info->bb_first_free > start) ?
-               e4b.bd_info->bb_first_free : start;
+       start = max(e4b.bd_info->bb_first_free, start);
        if (end >= EXT4_CLUSTERS_PER_GROUP(sb))
                end = EXT4_CLUSTERS_PER_GROUP(sb) - 1;