diff options
| author | Aurelien Aptel <aaptel@suse.com> | 2020-04-24 16:55:31 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-06-04 20:50:55 +0200 |
| commit | 2f58967979409ea3ec799343aa35e9007f735a3b (patch) | |
| tree | 9178aafea756cb177294fec6d4e872a18196b6fa /fs/cifs/smb2pdu.c | |
| parent | cifs: multichannel: use pointer for binding channel (diff) | |
| download | linux-2f58967979409ea3ec799343aa35e9007f735a3b.tar.xz linux-2f58967979409ea3ec799343aa35e9007f735a3b.zip | |
cifs: multichannel: try to rebind when reconnecting a channel
first steps in trying to make channels properly reconnect.
* add cifs_ses_find_chan() function to find the enclosing cifs_chan
struct it belongs to
* while we have the session lock and are redoing negprot and
sess.setup in smb2_reconnect() redo the binding of channels.
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 2497e0e428ac..ded96b529a4d 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -375,15 +375,31 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon, goto out; } + /* + * If we are reconnecting an extra channel, bind + */ + if (server->is_channel) { + ses->binding = true; + ses->binding_chan = cifs_ses_find_chan(ses, server); + } + rc = cifs_negotiate_protocol(0, tcon->ses); if (!rc && tcon->ses->need_reconnect) { rc = cifs_setup_session(0, tcon->ses, nls_codepage); if ((rc == -EACCES) && !tcon->retry) { rc = -EHOSTDOWN; + ses->binding = false; + ses->binding_chan = NULL; mutex_unlock(&tcon->ses->session_mutex); goto failed; } } + /* + * End of channel binding + */ + ses->binding = false; + ses->binding_chan = NULL; + if (rc || !tcon->need_reconnect) { mutex_unlock(&tcon->ses->session_mutex); goto out; |