| Message ID | 20231030110020.45627-4-sprasad@microsoft.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/14] cifs: print server capabilities in DebugData | expand |
merged into cifs-2.6.git for-next pending more testing On Mon, Oct 30, 2023 at 6:00 AM <nspmangalore@gmail.com> wrote: > > From: Shyam Prasad N <sprasad@microsoft.com> > > If the mount command has specified multichannel as a mount option, > but multichannel is found to be unsupported by the server at the time > of mount, we set chan_max to 1. Which means that the user needs to > remount the share if the server starts supporting multichannel. > > This change removes this reset. What it means is that if the user > specified multichannel or max_channels during mount, and at this > time, multichannel is not supported, but the server starts supporting > it at a later point, the client will be capable of scaling out the > number of channels. > > Signed-off-by: Shyam Prasad N <sprasad@microsoft.com> > --- > fs/smb/client/sess.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c > index 79f26c560edf..c899b05c92f7 100644 > --- a/fs/smb/client/sess.c > +++ b/fs/smb/client/sess.c > @@ -186,7 +186,6 @@ int cifs_try_adding_channels(struct cifs_sb_info *cifs_sb, struct cifs_ses *ses) > } > > if (!(server->capabilities & SMB2_GLOBAL_CAP_MULTI_CHANNEL)) { > - ses->chan_max = 1; > spin_unlock(&ses->chan_lock); > cifs_server_dbg(VFS, "no multichannel support\n"); > return 0; > -- > 2.34.1 >
merged into cifs-2.6.git for-next pending testing And added cc:stable On Mon, Oct 30, 2023 at 6:00 AM <nspmangalore@gmail.com> wrote: > > From: Shyam Prasad N <sprasad@microsoft.com> > > If the mount command has specified multichannel as a mount option, > but multichannel is found to be unsupported by the server at the time > of mount, we set chan_max to 1. Which means that the user needs to > remount the share if the server starts supporting multichannel. > > This change removes this reset. What it means is that if the user > specified multichannel or max_channels during mount, and at this > time, multichannel is not supported, but the server starts supporting > it at a later point, the client will be capable of scaling out the > number of channels. > > Signed-off-by: Shyam Prasad N <sprasad@microsoft.com> > --- > fs/smb/client/sess.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c > index 79f26c560edf..c899b05c92f7 100644 > --- a/fs/smb/client/sess.c > +++ b/fs/smb/client/sess.c > @@ -186,7 +186,6 @@ int cifs_try_adding_channels(struct cifs_sb_info *cifs_sb, struct cifs_ses *ses) > } > > if (!(server->capabilities & SMB2_GLOBAL_CAP_MULTI_CHANNEL)) { > - ses->chan_max = 1; > spin_unlock(&ses->chan_lock); > cifs_server_dbg(VFS, "no multichannel support\n"); > return 0; > -- > 2.34.1 >
diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index 79f26c560edf..c899b05c92f7 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -186,7 +186,6 @@ int cifs_try_adding_channels(struct cifs_sb_info *cifs_sb, struct cifs_ses *ses) } if (!(server->capabilities & SMB2_GLOBAL_CAP_MULTI_CHANNEL)) { - ses->chan_max = 1; spin_unlock(&ses->chan_lock); cifs_server_dbg(VFS, "no multichannel support\n"); return 0;