summaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorSteve French2015-06-24 06:37:11 +0200
committerSteve French2015-06-28 05:28:11 +0200
commitaab1893d5fbeb7c931e97189f54a71ab0ecbf4c7 (patch)
tree3ee55544c479e51524fefb8ecfe049f86e2758ef /fs/cifs/connect.c
parentadd struct FILE_STANDARD_INFO (diff)
downloadkernel-qcow2-linux-aab1893d5fbeb7c931e97189f54a71ab0ecbf4c7.tar.gz
kernel-qcow2-linux-aab1893d5fbeb7c931e97189f54a71ab0ecbf4c7.tar.xz
kernel-qcow2-linux-aab1893d5fbeb7c931e97189f54a71ab0ecbf4c7.zip
Add SMB3.11 mount option synonym for new dialect
Most people think of SMB 3.1.1 as SMB version 3.11 so add synonym for "vers=3.1.1" of "vers=3.11" on mount. Also make sure that unlike SMB3.0 and 3.02 we don't send validate negotiate on mount (it is handled by negotiate contexts) - add list of SMB3.11 specific functions (distinct from 3.0 dialect). Signed-off-by: Steve French <steve.french@primarydata.com>w
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r--fs/cifs/connect.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 9300b98d8584..247f4dd228cc 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -282,6 +282,7 @@ static const match_table_t cifs_smb_version_tokens = {
{ Smb_302, SMB302_VERSION_STRING },
#ifdef CONFIG_CIFS_SMB311
{ Smb_311, SMB311_VERSION_STRING },
+ { Smb_311, ALT_SMB311_VERSION_STRING },
#endif /* SMB311 */
{ Smb_version_err, NULL }
};
@@ -1139,7 +1140,7 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol)
break;
#ifdef CONFIG_CIFS_SMB311
case Smb_311:
- vol->ops = &smb30_operations; /* currently identical with 3.0 */
+ vol->ops = &smb311_operations;
vol->vals = &smb311_values;
break;
#endif /* SMB311 */