Updated fixes for compounding regression
diff mbox series

Message ID CAH2r5mu-7o2gigNDuB3zLQnGDSP1fS9QFUsVrTVMZi743-r+GQ@mail.gmail.com
State New
Headers show
Series
  • Updated fixes for compounding regression
Related show

Commit Message

Steve French Oct. 2, 2018, 11:58 p.m. UTC
Have updated for-next with Aurelien's fix for stable and the fixes for
compounding regression (including for Pavel's suggestion on the lease
break issue). See below
  ----------------------------------

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>
---
 fs/cifs/connect.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Ronnie Sahlberg Oct. 3, 2018, 9:30 p.m. UTC | #1
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>

----- Original Message -----
From: "Steve French" <smfrench@gmail.com>
To: "CIFS" <linux-cifs@vger.kernel.org>, "Pavel Shilovskiy" <pshilov@microsoft.com>, "ronnie sahlberg" <ronniesahlberg@gmail.com>, "Aurélien Aptel" <aaptel@suse.com>
Sent: Wednesday, 3 October, 2018 9:58:21 AM
Subject: Updated fixes for compounding regression

Have updated for-next with Aurelien's fix for stable and the fixes for
compounding regression (including for Pavel's suggestion on the lease
break issue). See below
  ----------------------------------

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>
---
 fs/cifs/connect.c | 3 +--
 1 file changed, 1 insertion(+), 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 @@ cifs_demultiplex_thread(void *p)
         } 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]);

Patch
diff mbox series

From 7af929d6d05ba5564139718e30d5bc96bdbc716a Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Tue, 2 Oct 2018 18:54:09 -0500
Subject: [PATCH 4/4] 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>
---
 fs/cifs/connect.c | 3 +--
 1 file changed, 1 insertion(+), 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 @@  cifs_demultiplex_thread(void *p)
 		} 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]);
-- 
2.17.1