summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-01-05 10:45:00 -0800
committerJaegeuk Kim <jaegeuk@kernel.org>2018-04-08 02:11:00 -0700
commit7f43602f4d104ad482f54e3a9122f3e5f31d60d9 (patch)
tree789b36b6abaa69c4391d3a6fe83675ff0cf776a5 /include/linux
parentd9cadc11bdcf9907041dcaba204384c0ff552b81 (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.h6
-rw-r--r--include/linux/fscrypt_supp.h3
2 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index f71d6326936e..486886811915 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -13,13 +13,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 c785f7297f29..cdfe1600f53e 100644
--- a/include/linux/fscrypt_supp.h
+++ b/include/linux/fscrypt_supp.h
@@ -10,6 +10,9 @@
#ifndef _LINUX_FSCRYPT_SUPP_H
#define _LINUX_FSCRYPT_SUPP_H
+#include <linux/mm.h>
+#include <linux/slab.h>
+
/*
* fscrypt superblock flags
*/