summaryrefslogtreecommitdiffstats
path: root/include/linux/fscrypt.h
diff options
context:
space:
mode:
authorEric Biggers2018-01-05 19:44:58 +0100
committerTheodore Ts'o2018-01-12 04:06:18 +0100
commitbb8179e5a8509876415c0eac6f6ba8a130b3cb47 (patch)
tree6889d1baa5a6ed7471f5e17ba549889dbeebcc3a /include/linux/fscrypt.h
parentfscrypt: move fscrypt_operations declaration to fscrypt_supp.h (diff)
downloadkernel-qcow2-linux-bb8179e5a8509876415c0eac6f6ba8a130b3cb47.tar.gz
kernel-qcow2-linux-bb8179e5a8509876415c0eac6f6ba8a130b3cb47.tar.xz
kernel-qcow2-linux-bb8179e5a8509876415c0eac6f6ba8a130b3cb47.zip
fscrypt: move fscrypt_valid_enc_modes() to fscrypt_private.h
The encryption modes are validated by fs/crypto/, not by individual filesystems. Therefore, move fscrypt_valid_enc_modes() from fscrypt.h to fscrypt_private.h. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'include/linux/fscrypt.h')
-rw-r--r--include/linux/fscrypt.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 33b95a91f720..2e4dce0365cf 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -57,20 +57,6 @@ struct fscrypt_name {
/* Maximum value for the third parameter of fscrypt_operations.set_context(). */
#define FSCRYPT_SET_CONTEXT_MAX_SIZE 28
-static inline bool fscrypt_valid_enc_modes(u32 contents_mode,
- u32 filenames_mode)
-{
- if (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC &&
- filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS)
- return true;
-
- if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS &&
- filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS)
- return true;
-
- return false;
-}
-
static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)
{
if (str->len == 1 && str->name[0] == '.')