cifs: nosharesock should be set on new server

commit b9ad6b5b687e798746024e5fc4574d8fa8bdfade upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d26703a..439f02f 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1217,10 +1217,8 @@ static int match_server(struct TCP_Server_Info *server, struct smb3_fs_context *
 {
        struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr;
 
 {
        struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr;
 

-       if (ctx->nosharesock) {
-               server->nosharesock = true;
+       if (ctx->nosharesock)

                return 0;
                return 0;

-       }

 
        /* this server does not share socket */
        if (server->nosharesock)
 
        /* this server does not share socket */
        if (server->nosharesock)


@@ -1376,6 +1374,9 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx)
                goto out_err;
        }
 
                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));
        tcp_ses->ops = ctx->ops;
        tcp_ses->vals = ctx->vals;
        cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));