Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-20 04:19:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ubifs: CONFIG_UBIFS_FS_AUTHENTICATION should depend on UBIFS_FS

Browse Source 
Instead of adding yet another dependency on UBIFS_FS, wrap the whole
block of ubifs config options in a single "if UBIFS_FS".

Fixes: d8a22773a12c6d78 ("ubifs: Enable authentication support")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Geert Uytterhoeven 2018-11-05 09:25:40 +01:00 committed by Richard Weinberger
parent eb66eff663
commit aa3d31e08c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/ubifs/Kconfig
View File

@ -12,9 +12,10 @@ config UBIFS_FS
help help
UBIFS is a file system for flash devices which works on top of UBI. UBIFS is a file system for flash devices which works on top of UBI.
if UBIFS_FS
config UBIFS_FS_ADVANCED_COMPR config UBIFS_FS_ADVANCED_COMPR
bool "Advanced compression options" bool "Advanced compression options"
depends on UBIFS_FS
help help
This option allows to explicitly choose which compressions, if any, This option allows to explicitly choose which compressions, if any,
are enabled in UBIFS. Removing compressors means inability to read are enabled in UBIFS. Removing compressors means inability to read
@ -24,7 +25,6 @@ config UBIFS_FS_ADVANCED_COMPR
config UBIFS_FS_LZO config UBIFS_FS_LZO
bool "LZO compression support" if UBIFS_FS_ADVANCED_COMPR bool "LZO compression support" if UBIFS_FS_ADVANCED_COMPR
depends on UBIFS_FS
default y default y
help help
LZO compressor is generally faster than zlib but compresses worse. LZO compressor is generally faster than zlib but compresses worse.
@ -32,14 +32,12 @@ config UBIFS_FS_LZO
config UBIFS_FS_ZLIB config UBIFS_FS_ZLIB
bool "ZLIB compression support" if UBIFS_FS_ADVANCED_COMPR bool "ZLIB compression support" if UBIFS_FS_ADVANCED_COMPR
depends on UBIFS_FS
default y default y
help help
Zlib compresses better than LZO but it is slower. Say 'Y' if unsure. Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
config UBIFS_ATIME_SUPPORT config UBIFS_ATIME_SUPPORT
bool "Access time support" if UBIFS_FS bool "Access time support"
depends on UBIFS_FS
default n default n
help help
Originally UBIFS did not support atime, because it looked like a bad idea due Originally UBIFS did not support atime, because it looked like a bad idea due
@ -54,7 +52,6 @@ config UBIFS_ATIME_SUPPORT
config UBIFS_FS_XATTR config UBIFS_FS_XATTR
bool "UBIFS XATTR support" bool "UBIFS XATTR support"
depends on UBIFS_FS
default y default y
help help
Saying Y here includes support for extended attributes (xattrs). Saying Y here includes support for extended attributes (xattrs).
@ -65,7 +62,7 @@ config UBIFS_FS_XATTR
config UBIFS_FS_ENCRYPTION config UBIFS_FS_ENCRYPTION
bool "UBIFS Encryption" bool "UBIFS Encryption"
depends on UBIFS_FS && UBIFS_FS_XATTR && BLOCK depends on UBIFS_FS_XATTR && BLOCK
select FS_ENCRYPTION select FS_ENCRYPTION
default n default n
help help
@ -76,7 +73,7 @@ config UBIFS_FS_ENCRYPTION
config UBIFS_FS_SECURITY config UBIFS_FS_SECURITY
bool "UBIFS Security Labels" bool "UBIFS Security Labels"
depends on UBIFS_FS && UBIFS_FS_XATTR depends on UBIFS_FS_XATTR
default y default y
help help
Security labels provide an access control facility to support Linux Security labels provide an access control facility to support Linux
@ -96,3 +93,5 @@ config UBIFS_FS_AUTHENTICATION
If you say yes here you should also select a hashing algorithm such as If you say yes here you should also select a hashing algorithm such as
sha256, these are not selected automatically since there are many sha256, these are not selected automatically since there are many
different options. different options.
endif # UBIFS_FS