]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
smb3: fix lease break problem introduced by compounding
authorSteve French <stfrench@microsoft.com>
Tue, 2 Oct 2018 23:54:09 +0000 (18:54 -0500)
committerSteve French <stfrench@microsoft.com>
Tue, 2 Oct 2018 23:54:09 +0000 (18:54 -0500)
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>
fs/cifs/connect.c

index e9d64c92b8dae7376e8c6bc1c6bf6700c736b668..52d71b64c0c6e5f954d408098fc78197898399c7 100644 (file)
@@ -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]);