]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
fscrypt: clean up include file mess
authorDave Chinner <dchinner@redhat.com>
Mon, 9 Oct 2017 19:15:34 +0000 (12:15 -0700)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 18 Oct 2017 23:52:36 +0000 (19:52 -0400)
commit734f0d241d2b4e47383bd0d16e21e06f6cb8d2c3
treedf6e3cee4d0bfef93a6c65d3bd43bc0514ae565c
parent9e66317d3c92ddaab330c125dfe9d06eee268aff
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>
fs/crypto/fscrypt_private.h
fs/ext4/ext4.h
fs/f2fs/f2fs.h
fs/ubifs/ubifs.h
include/linux/fscrypt.h [new file with mode: 0644]
include/linux/fscrypt_common.h [deleted file]
include/linux/fscrypt_notsupp.h
include/linux/fscrypt_supp.h