erofs: update compression algorithm status

The following changes are proposed in the upcoming Linux 7.0:

 - Enable LZMA support by default, as it's already in use by Fedora 42/43
   and some Android vendors for minimal filesystem sizes;

 - Promote DEFLATE and Zstandard out of EXPERIMENTAL status, given that
   they have been landed and well-tested for over a year and are
   already ready for general use.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

diff --git a/Documentation/filesystems/erofs.rst b/Documentation/filesystems/erofs.rst
index af1df574e66cf3b44529bc2a700b3fca6fe72b6c..d6b3693eba607075dd20df3a97aaa65cac949aee 100644 (file)
--- a/Documentation/filesystems/erofs.rst
+++ b/Documentation/filesystems/erofs.rst
@@ -63,9 +63,9 @@ Here are the main features of EROFS:
  - Support POSIX.1e ACLs by using extended attributes;
 
  - Support transparent data compression as an option:
-   LZ4, MicroLZMA and DEFLATE algorithms can be used on a per-file basis; In
-   addition, inplace decompression is also supported to avoid bounce compressed
-   buffers and unnecessary page cache thrashing.
+   LZ4, MicroLZMA, DEFLATE and Zstandard algorithms can be used on a per-file
+   basis; In addition, inplace decompression is also supported to avoid bounce
+   compressed buffers and unnecessary page cache thrashing.
 
  - Support chunk-based data deduplication and rolling-hash compressed data
    deduplication;

diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig
index b71f2a8074feb90f90d6405df975f04ff8fdbda8..a9f645f57bb23f8951e6c35466f1fa0e284ac91a 100644 (file)
--- a/fs/erofs/Kconfig
+++ b/fs/erofs/Kconfig
@@ -112,13 +112,14 @@ config EROFS_FS_ZIP
 config EROFS_FS_ZIP_LZMA
        bool "EROFS LZMA compressed data support"
        depends on EROFS_FS_ZIP
+       default y
        help
          Saying Y here includes support for reading EROFS file systems
          containing LZMA compressed data, specifically called microLZMA. It
          gives better compression ratios than the default LZ4 format, at the
          expense of more CPU overhead.
 
-         If unsure, say N.
+         Say N if you want to disable LZMA compression support.
 
 config EROFS_FS_ZIP_DEFLATE
        bool "EROFS DEFLATE compressed data support"
@@ -129,9 +130,6 @@ config EROFS_FS_ZIP_DEFLATE
          ratios than the default LZ4 format, while it costs more CPU
          overhead.
 
-         DEFLATE support is an experimental feature for now and so most
-         file systems will be readable without selecting this option.
-
          If unsure, say N.
 
 config EROFS_FS_ZIP_ZSTD
@@ -141,10 +139,7 @@ config EROFS_FS_ZIP_ZSTD
          Saying Y here includes support for reading EROFS file systems
          containing Zstandard compressed data.  It gives better compression
          ratios than the default LZ4 format, while it costs more CPU
-         overhead.
-
-         Zstandard support is an experimental feature for now and so most
-         file systems will be readable without selecting this option.
+         overhead and memory footprint.
 
          If unsure, say N.
 

diff --git a/fs/erofs/decompressor_deflate.c b/fs/erofs/decompressor_deflate.c
index 3fb73000ed2752528039214030b8d8419a8d065c..4f26ab76764587897c710d83781657b3809517bd 100644 (file)
--- a/fs/erofs/decompressor_deflate.c
+++ b/fs/erofs/decompressor_deflate.c
@@ -89,7 +89,6 @@ static int z_erofs_load_deflate_config(struct super_block *sb,
                inited = true;
        }
        mutex_unlock(&deflate_resize_mutex);
-       erofs_info(sb, "EXPERIMENTAL DEFLATE feature in use. Use at your own risk!");
        return 0;
 failed:
        mutex_unlock(&deflate_resize_mutex);