diff options
| author | Steve French <smfrench@gmail.com> | 2016-06-22 20:12:05 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2016-06-24 12:04:50 -0500 |
| commit | 4fcd1813e6404dd4420c7d12fb483f9320f0bf93 (patch) | |
| tree | 48091c807886c6c61228bc32c600d4577849a2b5 /fs/cifs/connect.c | |
| parent | a6b6befbb2806697461962edb044e3376a771ebb (diff) | |
| download | linux-4fcd1813e6404dd4420c7d12fb483f9320f0bf93.tar.gz linux-4fcd1813e6404dd4420c7d12fb483f9320f0bf93.tar.bz2 linux-4fcd1813e6404dd4420c7d12fb483f9320f0bf93.zip | |
Fix reconnect to not defer smb3 session reconnect long after socket reconnect
Azure server blocks clients that open a socket and don't do anything on it.
In our reconnect scenarios, we can reconnect the tcp session and
detect the socket is available but we defer the negprot and SMB3 session
setup and tree connect reconnection until the next i/o is requested, but
this looks suspicous to some servers who expect SMB3 negprog and session
setup soon after a socket is created.
In the echo thread, reconnect SMB3 sessions and tree connections
that are disconnected. A later patch will replay persistent (and
resilient) handle opens.
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Steve French <steve.french@primarydata.com>
Acked-by: Pavel Shilovsky <pshilovsky@samba.org>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 66736f57b5ab..7d2b15c06090 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -428,7 +428,9 @@ cifs_echo_request(struct work_struct *work) * server->ops->need_neg() == true. Also, no need to ping if * we got a response recently. */ - if (!server->ops->need_neg || server->ops->need_neg(server) || + + if (server->tcpStatus == CifsNeedReconnect || + server->tcpStatus == CifsExiting || server->tcpStatus == CifsNew || (server->ops->can_echo && !server->ops->can_echo(server)) || time_before(jiffies, server->lstrp + echo_interval - HZ)) goto requeue_echo; |