diff options
| author | Steve French <smfrench@gmail.com> | 2017-07-08 18:48:15 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2017-07-08 18:57:07 -0500 |
| commit | 2a38e12053b760a8f5e85030eb89512660077c15 (patch) | |
| tree | 63c2fb7884899653fb85a5249708bccc58e1e9ef /fs/cifs/cifs_unicode.h | |
| parent | 511c54a2f69195b28afb9dd119f03787b1625bb4 (diff) | |
| download | linux-2a38e12053b760a8f5e85030eb89512660077c15.tar.bz2 | |
[SMB3] Remove ifdef since SMB3 (and later) now STRONGLY preferred
Remove the CONFIG_CIFS_SMB2 ifdef and Kconfig option since they
must always be on now.
For various security reasons, SMB3 and later are STRONGLY preferred
over CIFS and older dialects, and SMB3 (and later) will now be
the default dialects so we do not want to allow them to be
ifdeffed out.
In the longer term, we may be able to make older CIFS support
disableable in Kconfig with a new set of #ifdef, but we always
want SMB3 and later support enabled.
Signed-off-by: Steven French <smfrench@gmail.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/cifs_unicode.h')
| -rw-r--r-- | fs/cifs/cifs_unicode.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 8a79a34e66b8..8360b74530a9 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -116,11 +116,9 @@ char *cifs_strndup_from_utf16(const char *src, const int maxlen, extern int cifsConvertToUTF16(__le16 *target, const char *source, int maxlen, const struct nls_table *cp, int mapChars); extern int cifs_remap(struct cifs_sb_info *cifs_sb); -#ifdef CONFIG_CIFS_SMB2 extern __le16 *cifs_strndup_to_utf16(const char *src, const int maxlen, int *utf16_len, const struct nls_table *cp, int remap); -#endif /* CONFIG_CIFS_SMB2 */ #endif wchar_t cifs_toupper(wchar_t in); |