smb: client: Use min() macro

[ Upstream commit 25e68c37caf2b87c7dbcd99c54ec3102db7e4296 ]

Use the min() macro to simplify the function and improve
its readability.

Signed-off-by: Shen Lichuan <shenlichuan@vivo.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Stable-dep-of: 5349ae5e05fa ("smb: client: let send_done() cleanup before calling smbd_disconnect_rdma_connection()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index bf32bc22ebd69feef074a789c71b7299ad8cfbaf..7bd29e827c8f1bb95e8412187a40d822af2f371e 100644 (file)
--- a/fs/smb/client/cifsacl.c
+++ b/fs/smb/client/cifsacl.c
@@ -187,7 +187,7 @@ 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]) {

diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index d74e829de51c225a94f8221f03712f9826c030d7..c41a44f4fc63a95ba79a327065d96ec2df6ed0a6 100644 (file)
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -1585,10 +1585,8 @@ static struct smbd_connection *_smbd_get_connection(
        conn_param.initiator_depth = 0;
 
        conn_param.responder_resources =
-               info->id->device->attrs.max_qp_rd_atom
-                       < SMBD_CM_RESPONDER_RESOURCES ?
-               info->id->device->attrs.max_qp_rd_atom :
-               SMBD_CM_RESPONDER_RESOURCES;
+               min(info->id->device->attrs.max_qp_rd_atom,
+                   SMBD_CM_RESPONDER_RESOURCES);
        info->responder_resources = conn_param.responder_resources;
        log_rdma_mr(INFO, "responder_resources=%d\n",
                info->responder_resources);