tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ubifs: CONFIG_UBIFS_FS_AUTHENTICATION should depend on UBIFS_FS

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>

authored by

Geert Uytterhoeven and committed by
Richard Weinberger aa3d31e0 eb66eff6

+7 -8
+7 -8
fs/ubifs/Kconfig
··· 12 12 help 13 13 UBIFS is a file system for flash devices which works on top of UBI. 14 14 15 + if UBIFS_FS 16 + 15 17 config UBIFS_FS_ADVANCED_COMPR 16 18 bool "Advanced compression options" 17 - depends on UBIFS_FS 18 19 help 19 20 This option allows to explicitly choose which compressions, if any, 20 21 are enabled in UBIFS. Removing compressors means inability to read ··· 25 24 26 25 config UBIFS_FS_LZO 27 26 bool "LZO compression support" if UBIFS_FS_ADVANCED_COMPR 28 - depends on UBIFS_FS 29 27 default y 30 28 help 31 29 LZO compressor is generally faster than zlib but compresses worse. ··· 32 32 33 33 config UBIFS_FS_ZLIB 34 34 bool "ZLIB compression support" if UBIFS_FS_ADVANCED_COMPR 35 - depends on UBIFS_FS 36 35 default y 37 36 help 38 37 Zlib compresses better than LZO but it is slower. Say 'Y' if unsure. 39 38 40 39 config UBIFS_ATIME_SUPPORT 41 - bool "Access time support" if UBIFS_FS 42 - depends on UBIFS_FS 40 + bool "Access time support" 43 41 default n 44 42 help 45 43 Originally UBIFS did not support atime, because it looked like a bad idea due ··· 52 54 53 55 config UBIFS_FS_XATTR 54 56 bool "UBIFS XATTR support" 55 - depends on UBIFS_FS 56 57 default y 57 58 help 58 59 Saying Y here includes support for extended attributes (xattrs). ··· 62 65 63 66 config UBIFS_FS_ENCRYPTION 64 67 bool "UBIFS Encryption" 65 - depends on UBIFS_FS && UBIFS_FS_XATTR && BLOCK 68 + depends on UBIFS_FS_XATTR && BLOCK 66 69 select FS_ENCRYPTION 67 70 default n 68 71 help ··· 73 76 74 77 config UBIFS_FS_SECURITY 75 78 bool "UBIFS Security Labels" 76 - depends on UBIFS_FS && UBIFS_FS_XATTR 79 + depends on UBIFS_FS_XATTR 77 80 default y 78 81 help 79 82 Security labels provide an access control facility to support Linux ··· 93 96 If you say yes here you should also select a hashing algorithm such as 94 97 sha256, these are not selected automatically since there are many 95 98 different options. 99 + 100 + endif # UBIFS_FS