3 files changed, 26 insertions, 1 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 48455afefec8..7cbe28315971 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -178,6 +178,18 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command)
          * reconnect the same SMB session
          */
         mutex_lock(&ses->session_mutex);
+
+        /*
+         * Recheck after acquire mutex. If another thread is negotiating
+         * and the server never sends an answer the socket will be closed
+         * and tcpStatus set to reconnect.
+         */
+        if (server->tcpStatus == CifsNeedReconnect) {
+                rc = -EHOSTDOWN;
+                mutex_unlock(&ses->session_mutex);
+                goto out;
+        }
+
         rc = cifs_negotiate_protocol(0, ses);
         if (rc == 0 && ses->need_reconnect)
                 rc = cifs_setup_session(0, ses, nls_codepage);
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 83a8f52cd879..5aa2d278ca84 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -509,7 +509,8 @@ server_unresponsive(struct TCP_Server_Info *server)
          * 65s kernel_recvmsg times out, and we see that we haven't gotten
          *     a response in >60s.
          */
-        if (server->tcpStatus == CifsGood &&
+        if ((server->tcpStatus == CifsGood ||
+            server->tcpStatus == CifsNeedNegotiate) &&
             time_after(jiffies, server->lstrp + 2 * server->echo_interval)) {
                 cifs_dbg(VFS, "Server %s has not responded in %lu seconds. Reconnecting...\n",
                          server->hostname, (2 * server->echo_interval) / HZ);
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index d7595e735304..5531e7ee1210 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -238,6 +238,18 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
          * the same SMB session
          */
         mutex_lock(&tcon->ses->session_mutex);
+
+        /*
+         * Recheck after acquire mutex. If another thread is negotiating
+         * and the server never sends an answer the socket will be closed
+         * and tcpStatus set to reconnect.
+         */
+        if (server->tcpStatus == CifsNeedReconnect) {
+                rc = -EHOSTDOWN;
+                mutex_unlock(&tcon->ses->session_mutex);
+                goto out;
+        }
+
         rc = cifs_negotiate_protocol(0, tcon->ses);
         if (!rc && tcon->ses->need_reconnect)
                 rc = cifs_setup_session(0, tcon->ses, nls_codepage);