[PATCH][SMB3] default to minimum of two channels when multichannel specified

[PATCH][SMB3] default to minimum of two channels when multichannel specified

[Steve French]

[-- Attachment #1: Type: text/plain, Size: 120 bytes --]

    When "multichannel" is specified on mount, make sure to default to
    at least two channels.



-- 
Thanks,

Steve

[-- Attachment #2: 0001-smb3-default-to-minimum-of-two-channels-when-multich.patch --]
[-- Type: text/x-patch, Size: 1046 bytes --]

From ed58e117d1dc4b8aa317b251626958b5ffb06f5d Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Tue, 2 Jun 2020 23:17:16 -0500
Subject: [PATCH] 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>
---
 fs/cifs/connect.c | 4 ++++
 1 file changed, 4 insertions(+)

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;
-- 
2.25.1

Re: [PATCH][SMB3] default to minimum of two channels when multichannel specified

[Aurélien Aptel]

Reviewed-by: Aurelien Aptel <aaptel@suse.com>

-- 
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97  8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)