staging: erofs: update Kconfig

Keep in line with erofs-outofstaging patchset:
 - turn on CONFIG_EROFS_FS_ZIP by default;
 - turn on CONFIG_EROFS_FS_SECURITY by default suggested by David;
 - update Kconfig description.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Link: https://lore.kernel.org/r/20190731155752.210602-23-gaoxiang25@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/erofs/Kconfig b/drivers/staging/erofs/Kconfig
index 1a8e48943e504907a5a45ca99d9ea1d7e7bc0e91..16316d1adca335d5c25b333264426253843d66ab 100644 (file)
--- a/drivers/staging/erofs/Kconfig
+++ b/drivers/staging/erofs/Kconfig
@@ -4,16 +4,16 @@ config EROFS_FS
        tristate "EROFS filesystem support"
        depends on BLOCK
        help
-         EROFS(Enhanced Read-Only File System) is a lightweight
+         EROFS (Enhanced Read-Only File System) is a lightweight
          read-only file system with modern designs (eg. page-sized
          blocks, inline xattrs/data, etc.) for scenarios which need
-         high-performance read-only requirements, eg. firmwares in
-         mobile phone or LIVECDs.
+         high-performance read-only requirements, e.g. Android OS
+         for mobile phones and LIVECDs.
 
-         It also provides VLE compression support, focusing on
-         random read improvements, keeping relatively lower
-         compression ratios, which is useful for high-performance
-         devices with limited memory and ROM space.
+         It also provides fixed-sized output compression support,
+         which improves storage density, keeps relatively higher
+         compression ratios, which is more useful to achieve high
+         performance for embedded devices with limited memory.
 
          If unsure, say N.
 
@@ -21,11 +21,19 @@ config EROFS_FS_DEBUG
        bool "EROFS debugging feature"
        depends on EROFS_FS
        help
-         Print EROFS debugging messages and enable more BUG_ONs
-         which check the filesystem consistency aggressively.
+         Print debugging messages and enable more BUG_ONs which check
+         filesystem consistency and find potential issues aggressively,
+         which can be used for Android eng build, for example.
 
          For daily use, say N.
 
+config EROFS_FAULT_INJECTION
+       bool "EROFS fault injection facility"
+       depends on EROFS_FS
+       help
+         Test EROFS to inject faults such as ENOMEM, EIO, and so on.
+         If unsure, say N.
+
 config EROFS_FS_XATTR
        bool "EROFS extended attributes"
        depends on EROFS_FS
@@ -54,6 +62,7 @@ config EROFS_FS_POSIX_ACL
 config EROFS_FS_SECURITY
        bool "EROFS Security Labels"
        depends on EROFS_FS_XATTR
+       default y
        help
          Security labels provide an access control facility to support Linux
          Security Models (LSMs) accepted by AppArmor, SELinux, Smack and TOMOYO
@@ -63,22 +72,15 @@ config EROFS_FS_SECURITY
 
          If you are not using a security module, say N.
 
-config EROFS_FAULT_INJECTION
-       bool "EROFS fault injection facility"
-       depends on EROFS_FS
-       help
-         Test EROFS to inject faults such as ENOMEM, EIO, and so on.
-         If unsure, say N.
-
 config EROFS_FS_ZIP
-       bool "EROFS Data Compresssion Support"
+       bool "EROFS Data Compression Support"
        depends on EROFS_FS
        select LZ4_DECOMPRESS
+       default y
        help
-         Currently we support LZ4 VLE Compression only.
-         Play at your own risk.
+         Enable fixed-sized output compression for EROFS.
 
-         If you don't want to use compression feature, say N.
+         If you don't want to enable compression feature, say N.
 
 config EROFS_FS_CLUSTER_PAGE_LIMIT
        int "EROFS Cluster Pages Hard Limit"
@@ -86,11 +88,11 @@ config EROFS_FS_CLUSTER_PAGE_LIMIT
        range 1 256
        default "1"
        help
-         Indicates VLE compressed pages hard limit of a
-         compressed cluster.
+         Indicates maximum # of pages of a compressed
+         physical cluster.
 
-         For example, if files of a image are compressed
-         into 8k-unit, the hard limit should not be less
-         than 2. Otherwise, the image cannot be mounted
-         correctly on this kernel.
+         For example, if files in a image were compressed
+         into 8k-unit, hard limit should not be configured
+         less than 2. Otherwise, the image will be refused
+         to mount on this kernel.