Skip to content

Commit 0f24e3c

Browse files
committed
erofs: enable 48-bit layout support
Both 48-bit block addressing and encoded extents are implemented, let's enable them formally. Signed-off-by: Gao Xiang <[email protected]> Acked-by: Chao Yu <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7361d1e commit 0f24e3c

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

fs/erofs/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ config EROFS_FS
1313
smartphones with Android OS, LiveCDs and high-density hosts with
1414
numerous containers;
1515

16-
It also provides fixed-sized output compression support in order to
17-
improve storage density as well as keep relatively higher compression
18-
ratios and implements in-place decompression to reuse the file page
19-
for compressed data temporarily with proper strategies, which is
20-
quite useful to ensure guaranteed end-to-end runtime decompression
21-
performance under extremely memory pressure without extra cost.
16+
It also provides transparent compression and deduplication support to
17+
improve storage density and maintain relatively high compression
18+
ratios, and it implements in-place decompression to temporarily reuse
19+
page cache for compressed data using proper strategies, which is
20+
quite useful for ensuring guaranteed end-to-end runtime decompression
21+
performance under extreme memory pressure without extra cost.
2222

2323
See the documentation at <file:Documentation/filesystems/erofs.rst>
2424
and the web pages at <https://erofs.docs.kernel.org> for more details.
@@ -97,7 +97,7 @@ config EROFS_FS_ZIP
9797
select LZ4_DECOMPRESS
9898
default y
9999
help
100-
Enable fixed-sized output compression for EROFS.
100+
Enable transparent compression support for EROFS file systems.
101101

102102
If you don't want to enable compression feature, say N.
103103

fs/erofs/erofs_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES 0x00000040
3333
#define EROFS_FEATURE_INCOMPAT_48BIT 0x00000080
3434
#define EROFS_ALL_FEATURE_INCOMPAT \
35-
((EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES << 1) - 1)
35+
((EROFS_FEATURE_INCOMPAT_48BIT << 1) - 1)
3636

3737
#define EROFS_SB_EXTSLOT_SIZE 16
3838

fs/erofs/super.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ static int erofs_read_superblock(struct super_block *sb)
330330
/* handle multiple devices */
331331
ret = erofs_scan_devices(sb, dsb);
332332

333+
if (erofs_sb_has_48bit(sbi))
334+
erofs_info(sb, "EXPERIMENTAL 48-bit layout support in use. Use at your own risk!");
333335
if (erofs_is_fscache_mode(sb))
334336
erofs_info(sb, "[deprecated] fscache-based on-demand read feature in use. Use at your own risk!");
335337
out:

0 commit comments

Comments
 (0)