From: Steve French <stfrench@microsoft.com>
Date: Tue, 2 Oct 2018 23:54:09 +0000 (-0500)
Subject: smb3: fix lease break problem introduced by compounding
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7af929d6d05ba5564139718e30d5bc96bdbc716a;p=linux.git

smb3: fix lease break problem introduced by compounding

Fixes problem (discovered by Aurelien) introduced by recent commit:
commit b24df3e30cbf48255db866720fb71f14bf9d2f39
("cifs: update receive_encrypted_standard to handle compounded responses")

which broke the ability to respond to some lease breaks
(lease breaks being ignored is a problem since can block
server response for duration of the lease break timeout).

Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
---

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index e9d64c92b8dae..52d71b64c0c6e 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -946,8 +946,7 @@ next_pdu:
 		} else {
 			mids[0] = server->ops->find_mid(server, buf);
 			bufs[0] = buf;
-			if (mids[0])
-				num_mids = 1;
+			num_mids = 1;
 
 			if (!mids[0] || !mids[0]->receive)
 				length = standard_receive3(server, mids[0]);