diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-12-16 09:42:16 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2017-01-17 14:32:47 +0100 |
| commit | 404e0b63312ea294b058b4d5c964d064d321ea32 (patch) | |
| tree | 5c4726bd5c4c84b10e6c353e5a68ff37b29fb095 /fs | |
| parent | ubifs: fix unencrypted journal write (diff) | |
| download | linux-404e0b63312ea294b058b4d5c964d064d321ea32.tar.xz linux-404e0b63312ea294b058b4d5c964d064d321ea32.zip | |
ubifs: add CONFIG_BLOCK dependency for encryption
This came up during the v4.10 merge window:
warning: (UBIFS_FS_ENCRYPTION) selects FS_ENCRYPTION which has unmet direct dependencies (BLOCK)
fs/crypto/crypto.c: In function 'fscrypt_zeroout_range':
fs/crypto/crypto.c:355:9: error: implicit declaration of function 'bio_alloc';did you mean 'd_alloc'? [-Werror=implicit-function-declaration]
bio = bio_alloc(GFP_NOWAIT, 1);
The easiest way out is to limit UBIFS_FS_ENCRYPTION to configurations
that also enable BLOCK.
Fixes: d475a507457b ("ubifs: Add skeleton for fscrypto")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig index 0a908ae7af13..b0d0623c83ed 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig @@ -53,7 +53,7 @@ config UBIFS_ATIME_SUPPORT config UBIFS_FS_ENCRYPTION bool "UBIFS Encryption" - depends on UBIFS_FS + depends on UBIFS_FS && BLOCK select FS_ENCRYPTION default n help |