diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-05 10:45:00 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-01-11 22:06:19 -0500 |
| commit | a575784c6c13b8f1bae05fbba873e326ec73e289 (patch) | |
| tree | dff99e19ed9a4e2c0158273fe784ff79eaafc148 /fs/crypto | |
| parent | dcf0db9e5df369461c9d55282abbf66d263ef2db (diff) | |
| download | op-kernel-dev-a575784c6c13b8f1bae05fbba873e326ec73e289.zip op-kernel-dev-a575784c6c13b8f1bae05fbba873e326ec73e289.tar.gz | |
fscrypt: trim down fscrypt.h includes
fscrypt.h included way too many other headers, given that it is included
by filesystems both with and without encryption support. Trim down the
includes list by moving the needed includes into more appropriate
places, and removing the unneeded ones.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/crypto.c | 1 | ||||
| -rw-r--r-- | fs/crypto/fname.c | 1 | ||||
| -rw-r--r-- | fs/crypto/keyinfo.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index 732a786..ce65452 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -27,6 +27,7 @@ #include <linux/dcache.h> #include <linux/namei.h> #include <crypto/aes.h> +#include <crypto/skcipher.h> #include "fscrypt_private.h" static unsigned int num_prealloc_crypto_pages = 32; diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index b8c5061..52d4dbe 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -13,6 +13,7 @@ #include <linux/scatterlist.h> #include <linux/ratelimit.h> +#include <crypto/skcipher.h> #include "fscrypt_private.h" static inline bool fscrypt_is_dot_dotdot(const struct qstr *str) diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 5e6e846..c115eac 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -14,6 +14,7 @@ #include <linux/ratelimit.h> #include <crypto/aes.h> #include <crypto/sha.h> +#include <crypto/skcipher.h> #include "fscrypt_private.h" static struct crypto_shash *essiv_hash_tfm; |
