diff options
| author | Steve French <stfrench@microsoft.com> | 2018-06-28 19:30:23 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-08-07 14:15:56 -0500 |
| commit | 0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6 (patch) | |
| tree | ce9ba98d9fb47d68a40bd53307286e0a988b6f70 /fs/cifs/cifsfs.c | |
| parent | 950132afd59385caf6e2b84e5235d069fa10681d (diff) | |
| download | linux-0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6.tar.gz linux-0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6.tar.xz | |
smb3: simplify code by removing CONFIG_CIFS_SMB311
We really, really want to be encouraging use of secure dialects,
and SMB3.1.1 offers useful security features, and will soon
be the recommended dialect for many use cases. Simplify the code
by removing the CONFIG_CIFS_SMB311 ifdef so users don't disable
it in the build, and create compatibility and/or security issues
with modern servers - many of which have been supporting this
dialect for multiple years.
Also clarify some of the Kconfig text for cifs.ko about
SMB3.1.1 and current supported features in the module.
Signed-off-by: Steve French <stfrench@microsoft.com>
Acked-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 69ec5427769c..c162a416ddbf 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -483,20 +483,12 @@ cifs_show_options(struct seq_file *s, struct dentry *root) seq_puts(s, ",persistenthandles"); else if (tcon->use_resilient) seq_puts(s, ",resilienthandles"); - -#ifdef CONFIG_CIFS_SMB311 if (tcon->posix_extensions) seq_puts(s, ",posix"); else if (tcon->unix_ext) seq_puts(s, ",unix"); else seq_puts(s, ",nounix"); -#else - if (tcon->unix_ext) - seq_puts(s, ",unix"); - else - seq_puts(s, ",nounix"); -#endif /* SMB311 */ if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) seq_puts(s, ",posixpaths"); if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) |