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 /include/linux | |
| parent | fscrypt: move fscrypt_is_dot_dotdot() to fs/crypto/fname.c (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/fscrypt.h | 6 | ||||
| -rw-r--r-- | include/linux/fscrypt_supp.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 3045fc49d3ca..071ebabfc287 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -14,13 +14,7 @@ #ifndef _LINUX_FSCRYPT_H #define _LINUX_FSCRYPT_H -#include <linux/key.h> #include <linux/fs.h> -#include <linux/mm.h> -#include <linux/bio.h> -#include <linux/dcache.h> -#include <crypto/skcipher.h> -#include <uapi/linux/fs.h> #define FS_CRYPTO_BLOCK_SIZE 16 diff --git a/include/linux/fscrypt_supp.h b/include/linux/fscrypt_supp.h index ce61caf26f40..562a9bc04560 100644 --- a/include/linux/fscrypt_supp.h +++ b/include/linux/fscrypt_supp.h @@ -11,6 +11,9 @@ #ifndef _LINUX_FSCRYPT_SUPP_H #define _LINUX_FSCRYPT_SUPP_H +#include <linux/mm.h> +#include <linux/slab.h> + /* * fscrypt superblock flags */ |