cifs: reset connections for all channels when reconnect requested

commit 1f396b9bfe39aaf55ea74a7005806164b236653d upstream.

cifs_reconnect can be called with a flag to mark the session as needing
reconnect too. When this is done, we expect the connections of all
channels to be reconnected too, which is not happening today.

Without doing this, we have seen bad things happen when primary and
secondary channels are connected to different servers (in case of cloud
services like Azure Files SMB).

This change would force all connections to reconnect as well, not just
the sessions and tcons.

Cc: <stable@vger.kernel.org>
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index 76c04c4ed45fc7040558b0e76a2405b155c9f8d5..f351fb408f5cfe059368806f42ed65e50e91c694 100644 (file)
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -410,6 +410,13 @@ static int __cifs_reconnect(struct TCP_Server_Info *server,
        if (!cifs_tcp_ses_needs_reconnect(server, 1))
                return 0;
 
+       /*
+        * if smb session has been marked for reconnect, also reconnect all
+        * connections. This way, the other connections do not end up bad.
+        */
+       if (mark_smb_session)
+               cifs_signal_cifsd_for_reconnect(server, mark_smb_session);
+
        cifs_mark_tcp_ses_conns_for_reconnect(server, mark_smb_session);
 
        cifs_abort_connection(server);