Commit a575784c authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent dcf0db9e

fs/crypto/crypto.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

fs/crypto/fname.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

fs/crypto/keyinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

include/linux/fscrypt.h

+0 −6
Original line number Diff line number Diff line
@@ -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

include/linux/fscrypt_supp.h

+3 −0
Original line number Diff line number Diff line
@@ -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

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE