2018-04-09 1:06 GMT-07:00 Ronnie Sahlberg <lsahlber@xxxxxxxxxx>:
> and get rid of some get_rfc1002_length() in smb2
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@xxxxxxxxxx>
> ---
> fs/cifs/cifsglob.h | 2 ++
> fs/cifs/cifssmb.c | 2 +-
> fs/cifs/connect.c | 3 ++-
> fs/cifs/smb2ops.c | 8 ++++----
> 4 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
> index 2282562e78a1..92ba96fae09e 100644
> --- a/fs/cifs/cifsglob.h
> +++ b/fs/cifs/cifsglob.h
> @@ -665,6 +665,8 @@ struct TCP_Server_Info {
> struct delayed_work echo; /* echo ping workqueue job */
> char *smallbuf; /* pointer to current "small" buffer */
> char *bigbuf; /* pointer to current "big" buffer */
> + /* Total size of this PDU. Only valid from cifs_demultiplex_thread */
> + unsigned int pdu_size;
> unsigned int total_read; /* total amount of data read in this pass */
> #ifdef CONFIG_CIFS_FSCACHE
> struct fscache_cookie *fscache; /* client index cache cookie */
> diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
> index 59c09a596c0a..991e9d9ef90a 100644
> --- a/fs/cifs/cifssmb.c
> +++ b/fs/cifs/cifssmb.c
> @@ -1454,7 +1454,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
> unsigned int data_offset, data_len;
> struct cifs_readdata *rdata = mid->callback_data;
> char *buf = server->smallbuf;
> - unsigned int buflen = get_rfc1002_length(buf) +
> + unsigned int buflen = server->pdu_size +
> server->vals->header_preamble_size;
> bool use_rdma_mr = false;
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 4e0808f40195..48012a0addf1 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -772,7 +772,7 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid)
> {
> int length;
> char *buf = server->smallbuf;
> - unsigned int pdu_length = get_rfc1002_length(buf);
> + unsigned int pdu_length = server->pdu_size;
>
> /* make sure this will fit in a large buffer */
> if (pdu_length > CIFSMaxBufSize + MAX_HEADER_SIZE(server) -
> @@ -881,6 +881,7 @@ cifs_demultiplex_thread(void *p)
> * so we can now interpret the length field.
> */
> pdu_length = get_rfc1002_length(buf);
> + server->pdu_size = pdu_length;
>
> cifs_dbg(FYI, "RFC1002 header 0x%x\n", pdu_length);
> if (!is_smb_response(server, buf[0]))
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index 968b1d43a1ea..def84fed3571 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -2550,7 +2550,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid)
> unsigned int npages;
> struct page **pages;
> unsigned int len;
> - unsigned int buflen = get_rfc1002_length(buf) + server->vals->header_preamble_size;
> + unsigned int buflen = server->pdu_size + server->vals->header_preamble_size;
> int rc;
> int i = 0;
>
> @@ -2624,7 +2624,7 @@ receive_encrypted_standard(struct TCP_Server_Info *server,
> {
> int length;
> char *buf = server->smallbuf;
> - unsigned int pdu_length = get_rfc1002_length(buf);
> + unsigned int pdu_length = server->pdu_size;
> unsigned int buf_size;
> struct mid_q_entry *mid_entry;
>
> @@ -2668,7 +2668,7 @@ static int
> smb3_receive_transform(struct TCP_Server_Info *server, struct mid_q_entry **mid)
> {
> char *buf = server->smallbuf;
> - unsigned int pdu_length = get_rfc1002_length(buf);
> + unsigned int pdu_length = server->pdu_size;
> struct smb2_transform_hdr *tr_hdr = (struct smb2_transform_hdr *)buf;
> unsigned int orig_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
>
> @@ -2699,7 +2699,7 @@ smb3_handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid)
> {
> char *buf = server->large_buf ? server->bigbuf : server->smallbuf;
>
> - return handle_read_data(server, mid, buf, get_rfc1002_length(buf) +
> + return handle_read_data(server, mid, buf, server->pdu_size +
> server->vals->header_preamble_size,
> NULL, 0, 0);
> }
> --
> 2.13.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Reviewed-by: Pavel Shilovsky <pshilov@xxxxxxxxxxxxx>
--
Best regards,
Pavel Shilovsky
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
