Skip to content

Commit 74da24f

Browse files
geertuhsiangkao
authored andcommitted
erofs: Do not select tristate symbols from bool symbols
The EROFS filesystem has many configurable options, controlled through boolean Kconfig symbols. When enabled, these options may need to enable additional library functionality elsewhere. Currently this is done by selecting the symbol for the additional functionality. However, if EROFS_FS itself is modular, and the target symbol is a tristate symbol, the additional functionality is always forced built-in. Selecting tristate symbols from a tristate symbol does keep modular transitivity. Hence fix this by moving selects of tristate symbols to the main EROFS_FS symbol. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Gao Xiang <[email protected]> Link: https://lore.kernel.org/r/da1b899e511145dd43fd2d398f64b2e03c6a39e7.1753879351.git.geert+renesas@glider.be Signed-off-by: Gao Xiang <[email protected]>
1 parent c6993c4 commit 74da24f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

fs/erofs/Kconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,18 @@
33
config EROFS_FS
44
tristate "EROFS filesystem support"
55
depends on BLOCK
6+
select CACHEFILES if EROFS_FS_ONDEMAND
67
select CRC32
8+
select CRYPTO if EROFS_FS_ZIP_ACCEL
9+
select CRYPTO_DEFLATE if EROFS_FS_ZIP_ACCEL
710
select FS_IOMAP
11+
select LZ4_DECOMPRESS if EROFS_FS_ZIP
12+
select NETFS_SUPPORT if EROFS_FS_ONDEMAND
13+
select XXHASH if EROFS_FS_XATTR
14+
select XZ_DEC if EROFS_FS_ZIP_LZMA
15+
select XZ_DEC_MICROLZMA if EROFS_FS_ZIP_LZMA
16+
select ZLIB_INFLATE if EROFS_FS_ZIP_DEFLATE
17+
select ZSTD_DECOMPRESS if EROFS_FS_ZIP_ZSTD
818
help
919
EROFS (Enhanced Read-Only File System) is a lightweight read-only
1020
file system with modern designs (e.g. no buffer heads, inline
@@ -38,7 +48,6 @@ config EROFS_FS_DEBUG
3848
config EROFS_FS_XATTR
3949
bool "EROFS extended attributes"
4050
depends on EROFS_FS
41-
select XXHASH
4251
default y
4352
help
4453
Extended attributes are name:value pairs associated with inodes by
@@ -94,7 +103,6 @@ config EROFS_FS_BACKED_BY_FILE
94103
config EROFS_FS_ZIP
95104
bool "EROFS Data Compression Support"
96105
depends on EROFS_FS
97-
select LZ4_DECOMPRESS
98106
default y
99107
help
100108
Enable transparent compression support for EROFS file systems.
@@ -104,8 +112,6 @@ config EROFS_FS_ZIP
104112
config EROFS_FS_ZIP_LZMA
105113
bool "EROFS LZMA compressed data support"
106114
depends on EROFS_FS_ZIP
107-
select XZ_DEC
108-
select XZ_DEC_MICROLZMA
109115
help
110116
Saying Y here includes support for reading EROFS file systems
111117
containing LZMA compressed data, specifically called microLZMA. It
@@ -117,7 +123,6 @@ config EROFS_FS_ZIP_LZMA
117123
config EROFS_FS_ZIP_DEFLATE
118124
bool "EROFS DEFLATE compressed data support"
119125
depends on EROFS_FS_ZIP
120-
select ZLIB_INFLATE
121126
help
122127
Saying Y here includes support for reading EROFS file systems
123128
containing DEFLATE compressed data. It gives better compression
@@ -132,7 +137,6 @@ config EROFS_FS_ZIP_DEFLATE
132137
config EROFS_FS_ZIP_ZSTD
133138
bool "EROFS Zstandard compressed data support"
134139
depends on EROFS_FS_ZIP
135-
select ZSTD_DECOMPRESS
136140
help
137141
Saying Y here includes support for reading EROFS file systems
138142
containing Zstandard compressed data. It gives better compression
@@ -147,8 +151,6 @@ config EROFS_FS_ZIP_ZSTD
147151
config EROFS_FS_ZIP_ACCEL
148152
bool "EROFS hardware decompression support"
149153
depends on EROFS_FS_ZIP
150-
select CRYPTO
151-
select CRYPTO_DEFLATE
152154
help
153155
Saying Y here includes hardware accelerator support for reading
154156
EROFS file systems containing compressed data. It gives better
@@ -163,9 +165,7 @@ config EROFS_FS_ZIP_ACCEL
163165
config EROFS_FS_ONDEMAND
164166
bool "EROFS fscache-based on-demand read support (deprecated)"
165167
depends on EROFS_FS
166-
select NETFS_SUPPORT
167168
select FSCACHE
168-
select CACHEFILES
169169
select CACHEFILES_ONDEMAND
170170
help
171171
This permits EROFS to use fscache-backed data blobs with on-demand

0 commit comments

Comments
 (0)