From 1ee0e6d47d08ef309e0975a96d643972855511d0 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 2 Jun 2020 23:17:16 -0500 Subject: smb3: default to minimum of two channels when multichannel specified When "multichannel" is specified on mount, make sure to default to at least two channels. Signed-off-by: Steve French Reviewed-by: Ronnie Sahlberg --- fs/cifs/connect.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'fs/cifs') diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index daf90f988de1..fdfd7cf4c720 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1964,9 +1964,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, break; case Opt_multichannel: vol->multichannel = true; + /* if number of channels not specified, default to 2 */ + if (vol->max_channels < 2) + vol->max_channels = 2; break; case Opt_nomultichannel: vol->multichannel = false; + vol->max_channels = 1; break; case Opt_compress: vol->compression = UNKNOWN_TYPE; -- cgit v1.2.3-58-ga151