diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2018-06-01 10:53:02 +1000 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-05-31 21:30:50 -0500 |
| commit | 977b6170407894fcdd9bf8ea82dac563abda79e7 (patch) | |
| tree | 93f5305f333f2028d664bd995183f9550506286d /fs/cifs/connect.c | |
| parent | b2adf22fdfba85a6701c481faccdbbb3a418ccfc (diff) | |
cifs: remove rfc1002 header from all SMB2 response structures
Separate out all the 4 byte rfc1002 headers so that they are no longer
part of the SMB2 header structures to prepare for future work to add
compounding support.
Update the smb3 transform header processing that we no longer have
a rfc1002 header at the start of this structure.
Update smb2_readv_callback to accommodate that the first iovector in the
response is no the smb2 header and no longer a rfc1002 header.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 560b335fa752..b68c5b9ffbea 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -882,7 +882,11 @@ cifs_demultiplex_thread(void *p) length = cifs_read_from_socket(server, buf, pdu_length); if (length < 0) continue; - server->total_read = length; + + if (server->vals->header_preamble_size == 0) + server->total_read = 0; + else + server->total_read = length; /* * The right amount was read from socket - 4 bytes, |