diff options
| author |   Eric Biggers <ebiggers@google.com> | 2016-09-15 16:41:09 -0400 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2016-09-15 16:41:09 -0400 |
| commit | d83ae730b6f9464e46eaf052ff84d9486c5b4107 (patch) | |
| tree | bafcc52fbeac68aabaf16e3a95c3832177758380 /fs/crypto | |
| parent | fscrypto: improved validation when loading inode encryption metadata (diff) | |
| download | linux-dev-d83ae730b6f9464e46eaf052ff84d9486c5b4107.tar.xz linux-dev-d83ae730b6f9464e46eaf052ff84d9486c5b4107.zip | |
fscrypto: remove unnecessary includes
This patch removes some #includes that are clearly not needed, such as a
reference to ecryptfs, which is unrelated to the new filesystem
encryption code.
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 | 2 | ||||
| -rw-r--r-- | fs/crypto/keyinfo.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index c502c116924c..7c39eab47bdf 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -28,7 +28,6 @@ #include <linux/dcache.h> #include <linux/namei.h> #include <linux/fscrypto.h> -#include <linux/ecryptfs.h> static unsigned int num_prealloc_crypto_pages = 32; static unsigned int num_prealloc_crypto_ctxs = 128; diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 5d6d49113efa..31088061db17 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -10,8 +10,6 @@ * This has not yet undergone a rigorous security audit. */ -#include <keys/encrypted-type.h> -#include <keys/user-type.h> #include <linux/scatterlist.h> #include <linux/ratelimit.h> #include <linux/fscrypto.h> diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index b5374efc4ae3..82f0285f5d08 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -8,11 +8,8 @@ * Written by Michael Halcrow, Ildar Muslukhov, and Uday Savagaonkar, 2015. */ -#include <keys/encrypted-type.h> #include <keys/user-type.h> -#include <linux/random.h> #include <linux/scatterlist.h> -#include <uapi/linux/keyctl.h> #include <linux/fscrypto.h> static void derive_crypt_complete(struct crypto_async_request *req, int rc) |