[-next] cifs: convert to use be32_add_cpu()
diff mbox series

Message ID 20200725085601.98074-1-miaoqinglang@huawei.com
State New
Headers show
Series
  • [-next] cifs: convert to use be32_add_cpu()
Related show

Commit Message

Qinglang Miao July 25, 2020, 8:56 a.m. UTC
Convert cpu_to_be32(be32_to_cpu(E1) + E2) to use be32_add_cpu().

Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
 fs/cifs/connect.c | 3 +--
 fs/cifs/sess.c    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Comments

Steve French July 27, 2020, 1:29 a.m. UTC | #1
merged into cifs-2.6.git for-next

and for-next also updated with 5.8-rc7

On Sat, Jul 25, 2020 at 3:53 AM Qinglang Miao <miaoqinglang@huawei.com> wrote:
>
> Convert cpu_to_be32(be32_to_cpu(E1) + E2) to use be32_add_cpu().
>
> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
> ---
>  fs/cifs/connect.c | 3 +--
>  fs/cifs/sess.c    | 3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 889fee586..552975420 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -5114,8 +5114,7 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses,
>         bcc_ptr += strlen("?????");
>         bcc_ptr += 1;
>         count = bcc_ptr - &pSMB->Password[0];
> -       pSMB->hdr.smb_buf_length = cpu_to_be32(be32_to_cpu(
> -                                       pSMB->hdr.smb_buf_length) + count);
> +       be32_add_cpu(&pSMB->hdr.smb_buf_length, count);
>         pSMB->ByteCount = cpu_to_le16(count);
>
>         rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, &length,
> diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
> index 6708ab0aa..69cd58566 100644
> --- a/fs/cifs/sess.c
> +++ b/fs/cifs/sess.c
> @@ -938,8 +938,7 @@ sess_sendreceive(struct sess_data *sess_data)
>         struct kvec rsp_iov = { NULL, 0 };
>
>         count = sess_data->iov[1].iov_len + sess_data->iov[2].iov_len;
> -       smb_buf->smb_buf_length =
> -               cpu_to_be32(be32_to_cpu(smb_buf->smb_buf_length) + count);
> +       be32_add_cpu(&smb_buf->smb_buf_length, count);
>         put_bcc(count, smb_buf);
>
>         rc = SendReceive2(sess_data->xid, sess_data->ses,
> --
> 2.25.1
>

Patch
diff mbox series

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 889fee586..552975420 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -5114,8 +5114,7 @@  CIFSTCon(const unsigned int xid, struct cifs_ses *ses,
 	bcc_ptr += strlen("?????");
 	bcc_ptr += 1;
 	count = bcc_ptr - &pSMB->Password[0];
-	pSMB->hdr.smb_buf_length = cpu_to_be32(be32_to_cpu(
-					pSMB->hdr.smb_buf_length) + count);
+	be32_add_cpu(&pSMB->hdr.smb_buf_length, count);
 	pSMB->ByteCount = cpu_to_le16(count);
 
 	rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, &length,
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 6708ab0aa..69cd58566 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -938,8 +938,7 @@  sess_sendreceive(struct sess_data *sess_data)
 	struct kvec rsp_iov = { NULL, 0 };
 
 	count = sess_data->iov[1].iov_len + sess_data->iov[2].iov_len;
-	smb_buf->smb_buf_length =
-		cpu_to_be32(be32_to_cpu(smb_buf->smb_buf_length) + count);
+	be32_add_cpu(&smb_buf->smb_buf_length, count);
 	put_bcc(count, smb_buf);
 
 	rc = SendReceive2(sess_data->xid, sess_data->ses,