Skip to content

Commit 8663da2

Browse files
torvaldstorvalds
committed
Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 fixes from Ted Ts'o: "Some miscellaneous bug fixes and some final on-disk and ABI changes for ext4 encryption which provide better security and performance" * tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix growing of tiny filesystems ext4: move check under lock scope to close a race. ext4: fix data corruption caused by unwritten and delayed extents ext4 crypto: remove duplicated encryption mode definitions ext4 crypto: do not select from EXT4_FS_ENCRYPTION ext4 crypto: add padding to filenames before encrypting ext4 crypto: simplify and speed up filename encryption
2 parents 101a6fd + 2c869b2 commit 8663da2

File tree

13 files changed

+210
-229
lines changed

13 files changed

+210
-229
lines changed

‎fs/ext4/Kconfig

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ config EXT4_FS_SECURITY
6464
If you are not using a security module that requires using
6565
extended attributes for file security labels, say N.
6666

67-
config EXT4_FS_ENCRYPTION
68-
bool "Ext4 Encryption"
67+
config EXT4_ENCRYPTION
68+
tristate "Ext4 Encryption"
6969
depends on EXT4_FS
7070
select CRYPTO_AES
7171
select CRYPTO_CBC
@@ -81,6 +81,11 @@ config EXT4_FS_ENCRYPTION
8181
efficient since it avoids caching the encrypted and
8282
decrypted pages in the page cache.
8383

84+
config EXT4_FS_ENCRYPTION
85+
bool
86+
default y
87+
depends on EXT4_ENCRYPTION
88+
8489
config EXT4_DEBUG
8590
bool "EXT4 debugging support"
8691
depends on EXT4_FS

0 commit comments

Comments
 (0)