fscrypt: clean up include file mess

Browse source

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>

...

This commit is contained in:

Dave Chinner 2017-10-09 12:15:34 -07:00 • committed by Theodore Ts'o

parent 9e66317d3c

commit 734f0d241d

8 changed files with 177 additions and 162 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

41

include/linux/fscrypt_common.h → include/linux/fscrypt.h

View file

7

include/linux/fscrypt_notsupp.h

View file

7

include/linux/fscrypt_supp.h

View file