diff options
| author |   Steve French <steve.french@primarydata.com> | 2014-12-17 22:52:58 -0600 |
|---|---|---|
| committer | Steve French <steve.french@primarydata.com> | 2015-06-27 20:23:32 -0700 |
| commit | 5f7fbf733c9dd6b58d40fa394313a5949b696f84 (patch) | |
| tree | 8124f7318569872366b1138680ef81800cb20ffe /fs/cifs/connect.c | |
| parent | client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set (diff) | |
| download | linux-dev-5f7fbf733c9dd6b58d40fa394313a5949b696f84.tar.xz linux-dev-5f7fbf733c9dd6b58d40fa394313a5949b696f84.zip | |
Allow parsing vers=3.11 on cifs mount
Parses and recognizes "vers=3.1.1" on cifs mount and allows sending
0x0311 as a new CIFS/SMB3 dialect. Subsequent patches will add
the new negotiate contexts and updated session setup
Reviewed-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: Steve French <steve.french@primarydata.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 8383d5ea4202..9300b98d8584 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -280,6 +280,10 @@ static const match_table_t cifs_smb_version_tokens = { { Smb_21, SMB21_VERSION_STRING }, { Smb_30, SMB30_VERSION_STRING }, { Smb_302, SMB302_VERSION_STRING }, +#ifdef CONFIG_CIFS_SMB311 + { Smb_311, SMB311_VERSION_STRING }, +#endif /* SMB311 */ + { Smb_version_err, NULL } }; static int ip_connect(struct TCP_Server_Info *server); @@ -1133,6 +1137,12 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol) vol->ops = &smb30_operations; /* currently identical with 3.0 */ vol->vals = &smb302_values; break; +#ifdef CONFIG_CIFS_SMB311 + case Smb_311: + vol->ops = &smb30_operations; /* currently identical with 3.0 */ + vol->vals = &smb311_values; + break; +#endif /* SMB311 */ #endif default: cifs_dbg(VFS, "Unknown vers= option specified: %s\n", value); |