From: Ronnie Sahlberg <lsahlber@redhat.com>
Date: Mon, 9 Apr 2018 08:06:31 +0000 (+1000)
Subject: cifs: remove rfc1002 hardcoded constants from cifs_discard_remaining_data()
X-Git-Tag: Ubuntu-5.0.0-8.9~2608^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=05432e2938ddb8bd942e5a89298e763cf785edb6;p=mirror_ubuntu-disco-kernel.git

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>
---

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;