diff options
| author |   Steve French <stfrench@microsoft.com> | 2021-05-07 19:33:51 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2021-05-08 10:51:06 -0500 |
| commit | c1f8a398b6d661b594556a91224b096d92293061 (patch) | |
| tree | 4cf51dc147147f4b3630305dd9bbde66e2abfe21 /fs | |
| parent | smb3: do not attempt multichannel to server which does not support it (diff) | |
| download | linux-dev-c1f8a398b6d661b594556a91224b096d92293061.tar.xz linux-dev-c1f8a398b6d661b594556a91224b096d92293061.zip | |
smb3: if max_channels set to more than one channel request multichannel
Mounting with "multichannel" is obviously implied if user requested
more than one channel on mount (ie mount parm max_channels>1).
Currently both have to be specified. Fix that so that if max_channels
is greater than 1 on mount, enable multichannel rather than silently
falling back to non-multichannel.
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-By: Tom Talpey <tom@talpey.com>
Cc: <stable@vger.kernel.org> # v5.11+
Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/fs_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c index 3bcf881c3ae9..5d21cd905315 100644 --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -1021,6 +1021,9 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, goto cifs_parse_mount_err; } ctx->max_channels = result.uint_32; + /* If more than one channel requested ... they want multichan */ + if (result.uint_32 > 1) + ctx->multichannel = true; break; case Opt_handletimeout: ctx->handle_timeout = result.uint_32; |