Skip to content

Commit c1f1f5b

Browse files
committed
fscrypt: document that CephFS supports fscrypt now
The help text for CONFIG_FS_ENCRYPTION and the fscrypt.rst documentation file both list the filesystems that support fscrypt. CephFS added support for fscrypt in v6.6, so add CephFS to the list. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Eric Biggers <[email protected]>
1 parent 0fc24a6 commit c1f1f5b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Documentation/filesystems/fscrypt.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ However, except for filenames, fscrypt does not encrypt filesystem
3131
metadata.
3232

3333
Unlike eCryptfs, which is a stacked filesystem, fscrypt is integrated
34-
directly into supported filesystems --- currently ext4, F2FS, and
35-
UBIFS. This allows encrypted files to be read and written without
36-
caching both the decrypted and encrypted pages in the pagecache,
37-
thereby nearly halving the memory used and bringing it in line with
38-
unencrypted files. Similarly, half as many dentries and inodes are
39-
needed. eCryptfs also limits encrypted filenames to 143 bytes,
40-
causing application compatibility issues; fscrypt allows the full 255
41-
bytes (NAME_MAX). Finally, unlike eCryptfs, the fscrypt API can be
42-
used by unprivileged users, with no need to mount anything.
34+
directly into supported filesystems --- currently ext4, F2FS, UBIFS,
35+
and CephFS. This allows encrypted files to be read and written
36+
without caching both the decrypted and encrypted pages in the
37+
pagecache, thereby nearly halving the memory used and bringing it in
38+
line with unencrypted files. Similarly, half as many dentries and
39+
inodes are needed. eCryptfs also limits encrypted filenames to 143
40+
bytes, causing application compatibility issues; fscrypt allows the
41+
full 255 bytes (NAME_MAX). Finally, unlike eCryptfs, the fscrypt API
42+
can be used by unprivileged users, with no need to mount anything.
4343

4444
fscrypt does not support encrypting files in-place. Instead, it
4545
supports marking an empty directory as encrypted. Then, after

fs/crypto/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ config FS_ENCRYPTION
1111
feature is similar to ecryptfs, but it is more memory
1212
efficient since it avoids caching the encrypted and
1313
decrypted pages in the page cache. Currently Ext4,
14-
F2FS and UBIFS make use of this feature.
14+
F2FS, UBIFS, and CephFS make use of this feature.
1515

1616
# Filesystems supporting encryption must select this if FS_ENCRYPTION. This
1717
# allows the algorithms to be built as modules when all the filesystems are,

0 commit comments

Comments
 (0)