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 <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index daf90f988de1e0d05f15506e62447513a9a47de5..fdfd7cf4c720abcb78316596cf04ca340b3c6867 100644 (file)
--- 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;