diff options
| author | Steve French <stfrench@microsoft.com> | 2018-06-29 03:30:23 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-08-07 22:15:56 +0300 |
| commit | 0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6 (patch) | |
| tree | ce9ba98d9fb47d68a40bd53307286e0a988b6f70 /fs/cifs/smb2ops.c | |
| parent | 950132afd59385caf6e2b84e5235d069fa10681d (diff) | |
| download | 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/smb2ops.c')
| -rw-r--r-- | fs/cifs/smb2ops.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index e2a8b9d90ad8..27b69977809d 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1533,7 +1533,6 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, return rc; } -#ifdef CONFIG_CIFS_SMB311 static int smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon, struct kstatfs *buf) @@ -1564,7 +1563,6 @@ smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon, SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid); return rc; } -#endif /* SMB311 */ static bool smb2_compare_fids(struct cifsFileInfo *ob1, struct cifsFileInfo *ob2) @@ -3303,7 +3301,6 @@ struct smb_version_operations smb30_operations = { .next_header = smb2_next_header, }; -#ifdef CONFIG_CIFS_SMB311 struct smb_version_operations smb311_operations = { .compare_fids = smb2_compare_fids, .setup_request = smb2_setup_request, @@ -3404,7 +3401,6 @@ struct smb_version_operations smb311_operations = { #endif /* CIFS_XATTR */ .next_header = smb2_next_header, }; -#endif /* CIFS_SMB311 */ struct smb_version_values smb20_values = { .version_string = SMB20_VERSION_STRING, @@ -3532,7 +3528,6 @@ struct smb_version_values smb302_values = { .create_lease_size = sizeof(struct create_lease_v2), }; -#ifdef CONFIG_CIFS_SMB311 struct smb_version_values smb311_values = { .version_string = SMB311_VERSION_STRING, .protocol_id = SMB311_PROT_ID, @@ -3553,4 +3548,3 @@ struct smb_version_values smb311_values = { .signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED, .create_lease_size = sizeof(struct create_lease_v2), }; -#endif /* SMB311 */ |