diff options
author | Steve French <stfrench@microsoft.com> | 2018-10-02 18:54:09 -0500 |
---|---|---|
committer | Steve French <stfrench@microsoft.com> | 2018-10-02 18:54:09 -0500 |
commit | 7af929d6d05ba5564139718e30d5bc96bdbc716a (patch) | |
tree | 299dbd511f05d4e3a3a1fa42429c3107cbd5dbe9 /fs | |
parent | 4e34feb5e96328df6a362c88098502b07c1b1e69 (diff) | |
download | linux-7af929d6d05ba5564139718e30d5bc96bdbc716a.tar.bz2 |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e9d64c92b8da..52d71b64c0c6 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]); |