diff options
| author |   Shyam Prasad N <sprasad@microsoft.com> | 2021-11-21 16:45:44 +0000 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2021-11-23 10:04:49 -0600 |
| commit | b9ad6b5b687e798746024e5fc4574d8fa8bdfade (patch) | |
| tree | bb72ae94155b344dfbbe50dde63587c6258f680e /fs/cifs | |
| parent | Linux 5.16-rc2 (diff) | |
| download | linux-dev-b9ad6b5b687e798746024e5fc4574d8fa8bdfade.tar.xz linux-dev-b9ad6b5b687e798746024e5fc4574d8fa8bdfade.zip | |
cifs: nosharesock should be set on new server
Recent fix to maintain a nosharesock state on the
server struct caused a regression. It updated this
field in the old tcp session, and not the new one.
This caused the multichannel scenario to misbehave.
Fixes: c9f1c19cf7c5 (cifs: nosharesock should not share socket with future sessions)
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/connect.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 67e4c5548e9d..6b705026da1a 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1271,10 +1271,8 @@ static int match_server(struct TCP_Server_Info *server, struct smb3_fs_context * { struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr; - if (ctx->nosharesock) { - server->nosharesock = true; + if (ctx->nosharesock) return 0; - } /* this server does not share socket */ if (server->nosharesock) @@ -1438,6 +1436,9 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx, goto out_err; } + if (ctx->nosharesock) + tcp_ses->nosharesock = true; + tcp_ses->ops = ctx->ops; tcp_ses->vals = ctx->vals; cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns)); |