Skip to content

Commit cbbc7a0

Browse files
sprasad-microsoftsmb49
authored andcommitted
cifs: avoid redundant calls to disable multichannel
BugLink: https://bugs.launchpad.net/bugs/2059991 [ Upstream commit e77e15f ] When the server reports query network interface info call as unsupported following a tree connect, it means that multichannel is unsupported, even if the server capabilities report otherwise. When this happens, cifs_chan_skip_or_disable is called to disable multichannel on the client. However, we only need to call this when multichannel is currently setup. Fixes: f591062 ("cifs: handle servers that still advertise multichannel after disabling") Signed-off-by: Shyam Prasad N <[email protected]> Signed-off-by: Steve French <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Portia Stephens <[email protected]> Signed-off-by: Roxana Nicolescu <[email protected]>
1 parent 6d44488 commit cbbc7a0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/smb/client/smb2pdu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon,
404404
rc = SMB3_request_interfaces(xid, tcon, false);
405405
free_xid(xid);
406406

407-
if (rc == -EOPNOTSUPP) {
407+
if (rc == -EOPNOTSUPP && ses->chan_count > 1) {
408408
/*
409409
* some servers like Azure SMB server do not advertise
410410
* that multichannel has been disabled with server

0 commit comments

Comments
 (0)