Received-SPF: pass (google.com: domain of linux-kernel-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:     Namjae Jeon <linkinjeon@kernel.org>,
        Steve French <sfrench@samba.org>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Tom Talpey <tom@talpey.com>,
        linux-cifs@vger.kernel.org (open list:KERNEL SMB3 SERVER (KSMBD)),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH] fs: smb: server: Replace the ternary conditional operator with min()
Date:   Fri,  9 Jun 2023 13:06:36 +0800
Message-Id: <20230609050636.27669-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?xXd9iQezmAnwXXWwr+oduc/quJjeqbFfUx/f8LqZz8cXNXVN97BRdhHIQU4n?=
 =?us-ascii?Q?uQ94qOf9XqnkmkCizumQ4Jutdd6ar+J6NBDxtFJ2GDtDITDgshpQQjCuQGBd?=
 =?us-ascii?Q?09zfOkkuC54DKGrx0TuxbHfl+t5W71AutCBKPqMvvwchz/YvOmmb7VEUnh4j?=
 =?us-ascii?Q?YYccPxmlDnDz863Eem/+mZ4osL2FCnMtSbOVcy7+EWnT1MZ91M01DjCUJESO?=
 =?us-ascii?Q?K25ScxGLoHfxHLs/lx4h2oHracUr2aPsdeUddFiNxZu6o3mi3QdeXMjYL/km?=
 =?us-ascii?Q?+38RHdvQmWBsneV3vpotoAaQYxGzMJpKVngATs5xaIF4KJh2Av2YgTUvzVpW?=
 =?us-ascii?Q?YQTlOT/417aoIVoBwG7HI3z830oxP80jC4jdi7dBx/3zoUEGBdTQXbLQM5SA?=
 =?us-ascii?Q?dJtTlh/GI/x6sbtf5Jx0V14Md/0GBin8LnrtKs4OaSqbRXUrnvN8U5V3qos6?=
 =?us-ascii?Q?tE/8DYnSc+GGiQ2Vm2QUvvAzmwYJeVm7l34bdg6Tk1/o5CJDh7fU+66NJZ41?=
 =?us-ascii?Q?mW6wCPBYocIbuipFHEu4duUsjQWnl/XtipXWK62trqHGCc21cE2gd/O0cc7W?=
 =?us-ascii?Q?5u/BF/wHLHerk2Pe8EnwcYlJudhFUmSjqWlxilq02XhON7IdBW7dkoDXbuFu?=
 =?us-ascii?Q?3RXcpPG2k2+z5URPj9mxUL9lboerDY/Jj6ay0GzieLps4aqYfsVmXrRfTKBB?=
 =?us-ascii?Q?47Auqru71cgs/pAniTpF93GT+mWPSGmVaDzHuW8lenYEqq3OKnojsHh7HMQT?=
 =?us-ascii?Q?Ex7lfppmy8u2uX5pS5hht7xdxhDaz2j2waXwF9klmq28QYFqXzMNtfeEOQZ3?=
 =?us-ascii?Q?o/nJ4FDYOYLJG7+uUDvVP/OeTkT5NpaxhIVmWVZrmZf1RM7qL8/X5yPZF7IL?=
 =?us-ascii?Q?8XHRkkiPEs2Dlqx0FfvtWyjFntAiQoXYOPBuNbgjnnoYqmcgZ1UQZMfjNUuP?=
 =?us-ascii?Q?O8iXC0hOp6DAN1uJwXydvG8aWrhR7N+Uf19tMgVjY/9XNXEG1JQj0PnYf7Mn?=
 =?us-ascii?Q?U1hHxJW+iojB4oxXTbjqH9OlQ0GzoIQIPJG7FF57d8NQVQGyt9eb6bzy3uFB?=
 =?us-ascii?Q?QnGw/zJVrRu3RZkH2kSZHxi/3dBFoT+GlskAzBNs7Ztec8st79XSsU65owXs?=
 =?us-ascii?Q?Z1WzCriE5O1xYmZVx2ngiQXfrgctqKo5IeCu3HhyneQYtjLhOjgTeigA7wuy?=
 =?us-ascii?Q?B/5aAkhZIA0vIS4YOzv0kxo8IZzW6TkmQFDmibnef42pphxdBVQN8Abma0rA?=
 =?us-ascii?Q?E7PzUqt7jYeTk0TZWxQTtjHT7lFpHMmo0IWz9bZiYiJxIsY8aDnNY22mxtfk?=
 =?us-ascii?Q?pD/eT7li8v1K3VHmw90luaDbw2DycVwlBFlxeLE4XUzHk8UddnJKQ2SUfFSe?=
 =?us-ascii?Q?McdYQZZ5kHq9FMzfH5R4RXVRgedDrA1N6w0XYPdiqGZ+RZM8gb1go8jrrPMt?=
 =?us-ascii?Q?qlYtACtAnLed+BB6AaT8D+kMZMIb9qur7DNARlU6uthhGGBe0MnlHuHHzT7F?=
 =?us-ascii?Q?GyKyZQCYWG86uAayucrYn3FYlsCSbI1A9qVU/RVf1LKzlDtlFHCsPcDP94zh?=
 =?us-ascii?Q?N/njBU24lOhPyrFeOeQg/XgRCepmj1oDsaX3icbr?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5be0bd39-1ba5-4df7-e17f-08db68a75521
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 05:06:50.2705
 (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: RuJat0taSjgvzWcK7X5JbZwU8Tl7469+pJmFXheOmmENadzweI9rVfi1fjQUQFn3Wepm9FLBxhWt5vwRDpzsDQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5301
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,
        URIBL_BLOCKED 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-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It would be better to replace the traditional ternary conditional
operator with min() in compare_sids.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 fs/smb/server/smbacl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c
index 0a5862a61c77..a93ae72fe4ef
--- a/fs/smb/server/smbacl.c
+++ b/fs/smb/server/smbacl.c
@@ -97,7 +97,7 @@ int compare_sids(const struct smb_sid *ctsid, const struct smb_sid *cwsid)
 	/* compare all of the subauth values if any */
 	num_sat = ctsid->num_subauth;
 	num_saw = cwsid->num_subauth;
-	num_subauth = num_sat < num_saw ? num_sat : num_saw;
+	num_subauth = min(num_sat, num_saw);
 	if (num_subauth) {
 		for (i = 0; i < num_subauth; ++i) {
 			if (ctsid->sub_auth[i] != cwsid->sub_auth[i]) {
-- 
2.39.0