Message ID | 20240901164002.117305-2-thorsten.blum@toblux.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [RESEND] smb3: Use min() to improve _smbd_get_connection() | expand |
There is a similar patch in cifs-2.6.git for-next-next (for 6.12-rc) from smfrench@smfrench-ThinkPad-P52:~/cifs-2.6$ git show commit a85383ccf515f82ad791f9bfe70b0e6fb5a2117f (HEAD -> for-next-next, origin/for-next-next) Author: Shen Lichuan <shenlichuan@vivo.com> Date: Tue Aug 27 16:54:20 2024 +0800 smb: client: Use min() macro 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> On Sun, Sep 1, 2024 at 11:40 AM Thorsten Blum <thorsten.blum@toblux.com> wrote: > > Use the min() macro to simplify the _smbd_get_connection() function and > improve its readability. > > Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com> > --- > fs/smb/client/smbdirect.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c > index 7bcc379014ca..8f782edc3fd7 100644 > --- 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); > -- > 2.46.0 > >
diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c index 7bcc379014ca..8f782edc3fd7 100644 --- 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);
Use the min() macro to simplify the _smbd_get_connection() function and improve its readability. Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com> --- fs/smb/client/smbdirect.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)