[v1,11/13] cifs: use reconnect timer also for SMB1

Message ID	20200224131510.20608-12-metze@samba.org
State	New
Headers	show Return-Path: <linux-cifs-owner@vger.kernel.org> From: Stefan Metzmacher <metze@samba.org> To: linux-cifs@vger.kernel.org Cc: Stefan Metzmacher <metze@samba.org> Subject: [PATCH v1 11/13] cifs: use reconnect timer also for SMB1 Date: Mon, 24 Feb 2020 14:15:08 +0100 Message-Id: <20200224131510.20608-12-metze@samba.org> In-Reply-To: <20200224131510.20608-1-metze@samba.org> References: <20200224131510.20608-1-metze@samba.org> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk
Series	Avoid reconnects of failed session setups on soft mounts \| expand [v1,00/13] Avoid reconnects of failed session setups on soft mounts [v1,01/13] cifs: call wake_up(&server->response_q) inside of cifs_reconnect() [v1,02/13] cifs: use mod_delayed_work() for &server->reconnect if already queued [v1,03/13] cifs: make use of cap_unix(ses) in cifs_reconnect_tcon() [v1,04/13] cifs: split out a cifs_connect_session_locked() helper function [v1,05/13] cifs: merge __{cifs,smb2}_reconnect[_tcon]() into cifs_tree_connect() [v1,06/13] cifs: abstract cifs_tcon_reconnect() out of smb2_reconnect() [v1,07/13] cifs: cifs_reconnect_tcon() make use of the generic cifs_tcon_reconnect() function [v1,08/13] cifs: make cifs_tree_connect() static [v1,09/13] cifs: turn smb2_reconnect_server() into a generic cifs_reconnect_server() [v1,10/13] cifs: move cifs_reconnect_tcons() to fs/cifs/connect.c and make it static [v1,11/13] cifs: use reconnect timer also for SMB1 [v1,12/13] cifs: map STATUS_ACCOUNT_LOCKED_OUT to -EACCES [v1,13/13] cifs: introduce the CifsInvalidCredentials session state

Message ID

20200224131510.20608-12-metze@samba.org

State

New

Headers

From: Stefan Metzmacher <metze@samba.org>
To: linux-cifs@vger.kernel.org
Cc: Stefan Metzmacher <metze@samba.org>
Subject: [PATCH v1 11/13] cifs: use reconnect timer also for SMB1
Date: Mon, 24 Feb 2020 14:15:08 +0100
Message-Id: <20200224131510.20608-12-metze@samba.org>
In-Reply-To: <20200224131510.20608-1-metze@samba.org>
References: <20200224131510.20608-1-metze@samba.org>
Sender: linux-cifs-owner@vger.kernel.org
Precedence: bulk

Series

Avoid reconnects of failed session setups on soft mounts | expand

Commit Message

Stefan Metzmacher Feb. 24, 2020, 1:15 p.m. UTC

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---
 fs/cifs/cifssmb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 2cf74028ce70..1ede3a5c6889 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -129,7 +129,7 @@  static int
 cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command)
 {
 	struct cifs_tcon_reconnect_params params = {
-		.skip_reconnect = false,
+		.start_timer = true,
 	};
 
 	/*
@@ -662,6 +662,12 @@  CIFSSMBEcho(struct TCP_Server_Info *server)
 
 	cifs_dbg(FYI, "In echo request\n");
 
+	if (server->tcpStatus == CifsNeedNegotiate) {
+		/* No need to send echo on newly established connections */
+		mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
+		return rc;
+	}
+
 	rc = small_smb_init(SMB_COM_ECHO, 0, NULL, (void **)&smb);
 	if (rc)
 		return rc;

[v1,11/13] cifs: use reconnect timer also for SMB1

Commit Message

Patch