diff options
| author | Dave Chinner <dchinner@redhat.com> | 2017-10-09 12:15:34 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-18 19:52:36 -0400 |
| commit | 734f0d241d2b4e47383bd0d16e21e06f6cb8d2c3 (patch) | |
| tree | df6e3cee4d0bfef93a6c65d3bd43bc0514ae565c /fs/ubifs | |
| parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) | |
| download | op-kernel-dev-734f0d241d2b4e47383bd0d16e21e06f6cb8d2c3.zip op-kernel-dev-734f0d241d2b4e47383bd0d16e21e06f6cb8d2c3.tar.gz | |
fscrypt: clean up include file mess
Filesystems have to include different header files based on whether they
are compiled with encryption support or not. That's nasty and messy.
Instead, rationalise the headers so we have a single include fscrypt.h
and let it decide what internal implementation to include based on the
__FS_HAS_ENCRYPTION define. Filesystems set __FS_HAS_ENCRYPTION to 1
before including linux/fscrypt.h if they are built with encryption
support. Otherwise, they must set __FS_HAS_ENCRYPTION to 0.
Add guards to prevent fscrypt_supp.h and fscrypt_notsupp.h from being
directly included by filesystems.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
[EB: use 1 and 0 rather than defined/undefined]
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/ubifs.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index cd43651..6a346d4 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -38,12 +38,11 @@ #include <linux/backing-dev.h> #include <linux/security.h> #include <linux/xattr.h> -#ifdef CONFIG_UBIFS_FS_ENCRYPTION -#include <linux/fscrypt_supp.h> -#else -#include <linux/fscrypt_notsupp.h> -#endif #include <linux/random.h> + +#define __FS_HAS_ENCRYPTION IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) +#include <linux/fscrypt.h> + #include "ubifs-media.h" /* Version of this UBIFS implementation */ |
