Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Lu Hongfei <luhongfei@vivo.com>
To:     "Theodore Ts'o" <tytso@mit.edu>,
        Andreas Dilger <adilger.kernel@dilger.ca>,
        linux-ext4@vger.kernel.org (open list:EXT4 FILE SYSTEM),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH] ext4: Fix traditional comparison using max/min method
Date:   Mon, 29 May 2023 15:09:30 +0800
Message-Id: <20230529070930.37949-1-luhongfei@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SG1N9e11YCXn+pW+bHion1ZRBawWHzsxoUCoj4Np6aOCHt+NruWdHHQ9OBaR?=
 =?us-ascii?Q?4GHoCB6jYpW3xGxs4ogb17UVPJ4z6ADl9sv5D9208ii/g+LmrbqGjoJj355m?=
 =?us-ascii?Q?iA7pvVUun04+X6EPK2uXLqRDNd5EscUolToL+ZMkmyENSF/kNu94vvXyzor1?=
 =?us-ascii?Q?A3WMRJ5RSdAM8hOJXQ35d+WC0ciRvryafk9gMiq3oihsf3gRcXRvo9vdfNBs?=
 =?us-ascii?Q?MfJLXYw8K9PsxTxeZuQjvSZmfmvqszsbh1BrLJiKX0tUKKvSughHJNW1qkNC?=
 =?us-ascii?Q?Zms261lu/kfo9cMHBM//rAyne7runS4k57aQxE00vm44q8+iWYMMEhdtc80j?=
 =?us-ascii?Q?+5BYVEFWB19OLODsL/qia26xUgFcsSO7b9Ygdqarsa+EAHlOGCo2WNF9payk?=
 =?us-ascii?Q?P+gLFs9KEVQEtBLsdgKtrtZtzZu6KDGBx+4YQjhP//Ej2PjUVals9R4PaYVS?=
 =?us-ascii?Q?R7LM0ExdLdk69HGXe1J+Z1YxKJ+TPY7kzRn1v8QSOgVWYFAU30QZFsyojZGQ?=
 =?us-ascii?Q?VAwQA7gr5j4zkjL/1ZL0nDrEL8b+h7EDNNsW9cFto/CudFtuKQLY/mt60/eh?=
 =?us-ascii?Q?QKSCIhyi9TW+lR1VxuWJ7p6cIP41heFuhRrEElKu2g3iARnzcLgnMsevGxLa?=
 =?us-ascii?Q?FYkiGPXneMHJcegRG04tkI1nmqqP90fU73+atFPhd1FmJ4AlZe5VR9PYxgx3?=
 =?us-ascii?Q?NXWYwO6HEMqXzCnBAqQs5rZngCyTmZWp9LgdQ0CRlDrqygp49IGUlJ+1WfDe?=
 =?us-ascii?Q?rAo3f77xSc9Jg5hkE9WoLocE7toMQZTv4SXY6Dg10etzSCqVPwhwrbxjLZrv?=
 =?us-ascii?Q?m3qMS1oPsiL2QJAI9RvV/JKEoEzgfGbQuq/5+91o4o/qseeP7FeM/TyLUcuZ?=
 =?us-ascii?Q?xsjX+uYzht03kE8NF7b6uIx5/y6lTAELWHcRfFazxXnrm5FEtH+dEBjLIEYU?=
 =?us-ascii?Q?uFxVl6SGxXy5hUUfF85S4KuwTTo4j0U5fnvmqPSWm7Ku1q+jmCUOCRpvSvvj?=
 =?us-ascii?Q?85xqPoBB2SFcjKyFVpapk0jPgAfXBzsNQygBj75qO2LQXtl13VLEIw+IACuC?=
 =?us-ascii?Q?bWQQFEhm03mx1tC2nJlzkT1dpc270u32rWx7IEAUcq9adHPeBQmjyKuCxkRG?=
 =?us-ascii?Q?hV2WucY+fYTtLn7K5VVsLPjmF2j3n9x6MDLkBZyg4z90srQG55iscDCWjTVR?=
 =?us-ascii?Q?+G99aHK6E44uby7tpdqhcGMVCt8p+dv4CJMX4kWC0Eo4Q8Hrc/uPKQcdW48y?=
 =?us-ascii?Q?VQHfOgDn63ODO77AlBTitAfRdAE4RZMwAEW43ImUo0Pn9tyx2kpttF9Lccr5?=
 =?us-ascii?Q?7tpvweS+H4DPbmGF42AiWV1cZu68QQHlCRZkkY9UL0/KV4JiikfFZaYs1dtb?=
 =?us-ascii?Q?bK7obm+DR4Wh/1UHYWzpibp/qdEs5C5n7sjxabAHDBBbQ69AuUtl4Ry/CuZp?=
 =?us-ascii?Q?Ox0qSdK2pkEneoJtUoB2Y5ati5AriUgEd/Y+Zr2cIeL0Of4hi32mQmzDuR5/?=
 =?us-ascii?Q?DRxRDDTnno2XACtnu1q1hnLybM+n1iABO95boM0fHtSs8F3kdrA0HupzZEG3?=
 =?us-ascii?Q?XBEf+dbt3Hh/e5ayjmZm5X7GYITHjqyFpGt1mlBT?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dcb2c998-8d22-4571-8fc1-08db6013ab4c
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 07:09:39.9721
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YJW4HL52NPjn65+UM7hX3C/+w2E5N7DzbBU371D5isaL1lSUBtlI+fsPxDynAV7umNqg3dQIHwsY96XsbIEjzA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB5737
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-ext4.vger.kernel.org>
X-Mailing-List: linux-ext4@vger.kernel.org

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

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 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