aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLu Hongfei2023-12-31 16:12:48 +0900
committerGreg Kroah-Hartman2024-01-05 15:18:31 +0100
commite7ab53bd81b044b5301290bae086de83619eb7d2 (patch)
tree48bbdf07d011120327d4ac0a3014153eb191e8d8
parent143da652cee848c56faa03af95608df7ebf7aef2 (diff)
ksmbd: Replace the ternary conditional operator with min()
[ Upstream commit f65fadb0422537d73f9a6472861852dc2f7a6a5b ] It would be better to replace the traditional ternary conditional operator with min() in compare_sids. Signed-off-by: Lu Hongfei <luhongfei@vivo.com> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/smb/server/smbacl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c
index 8fe2592c5525..03f19d3de2a1 100644
--- 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]) {