]> git.baikalelectronics.ru Git - kernel.git/commit
ubifs: add CONFIG_BLOCK dependency for encryption
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2016 08:42:16 +0000 (09:42 +0100)
committerRichard Weinberger <richard@nod.at>
Tue, 17 Jan 2017 13:32:47 +0000 (14:32 +0100)
commite3e2c7210a4f0fde4180af4589325e045148036e
tree5c4726bd5c4c84b10e6c353e5a68ff37b29fb095
parentbc5cf65d7c48aff3711e55f92e861e9ad0af974e
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: 329de44dfd26 ("ubifs: Add skeleton for fscrypto")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
fs/ubifs/Kconfig