diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2018-04-09 10:06:31 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2018-04-13 03:32:53 +0200 |
| commit | 05432e2938ddb8bd942e5a89298e763cf785edb6 (patch) | |
| tree | 857a3c8524489de51b3c89a82922727c8770e6cc /fs/cifs | |
| parent | cifs: Change SMB2_open to return an iov for the error parameter (diff) | |
| download | linux-05432e2938ddb8bd942e5a89298e763cf785edb6.tar.xz linux-05432e2938ddb8bd942e5a89298e763cf785edb6.zip | |
cifs: remove rfc1002 hardcoded constants from cifs_discard_remaining_data()
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifssmb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 890b3a40c79c..6d3e40d7029c 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1418,8 +1418,9 @@ openRetry: int cifs_discard_remaining_data(struct TCP_Server_Info *server) { - unsigned int rfclen = get_rfc1002_length(server->smallbuf); - int remaining = rfclen + 4 - server->total_read; + unsigned int rfclen = server->pdu_size; + int remaining = rfclen + server->vals->header_preamble_size - + server->total_read; while (remaining > 0) { int length; |