f2fs: assign default compression level

[ Upstream commit 00e120b5e4b5638cf19eee96d4332f2d100746ba ]

Let's avoid any confusion from assigning compress_level=0 for LZ4HC and ZSTD.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: f5f3bd903a5d ("f2fs: set the default compress_level on ioctl")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index c3ba202a7c29f7d3c426dc27b6cc09faea1f9150..4cb58e8d699e24356699db68fa26ab8ec9b350de 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -331,8 +331,6 @@ static const struct f2fs_compress_ops f2fs_lz4_ops = {
 #endif
 
 #ifdef CONFIG_F2FS_FS_ZSTD
-#define F2FS_ZSTD_DEFAULT_CLEVEL       1
-
 static int zstd_init_compress_ctx(struct compress_ctx *cc)
 {
        zstd_parameters params;
@@ -341,6 +339,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc)
        unsigned int workspace_size;
        unsigned char level = F2FS_I(cc->inode)->i_compress_level;
 
+       /* Need to remain this for backward compatibility */
        if (!level)
                level = F2FS_ZSTD_DEFAULT_CLEVEL;
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6fa3ac2097b270c3b9867a5c01552722a4567e13..5c76ba764b71f0932e27199de2295688c498f25d 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1501,6 +1501,8 @@ struct compress_data {
 
 #define F2FS_COMPRESSED_PAGE_MAGIC     0xF5F2C000
 
+#define F2FS_ZSTD_DEFAULT_CLEVEL       1
+
 #define        COMPRESS_LEVEL_OFFSET   8
 
 /* compress context */

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 4f87e0e374c25b27d92cae242a1010d043ab1ad6..584fe00fdeeb191965bc4e7a5d7a9ac1ffd3ca00 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -613,14 +613,12 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)
 {
 #ifdef CONFIG_F2FS_FS_LZ4HC
        unsigned int level;
-#endif
 
        if (strlen(str) == 3) {
-               F2FS_OPTION(sbi).compress_level = 0;
+               F2FS_OPTION(sbi).compress_level = LZ4HC_DEFAULT_CLEVEL;
                return 0;
        }
 
-#ifdef CONFIG_F2FS_FS_LZ4HC
        str += 3;
 
        if (str[0] != ':') {
@@ -638,6 +636,10 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)
        F2FS_OPTION(sbi).compress_level = level;
        return 0;
 #else
+       if (strlen(str) == 3) {
+               F2FS_OPTION(sbi).compress_level = 0;
+               return 0;
+       }
        f2fs_info(sbi, "kernel doesn't support lz4hc compression");
        return -EINVAL;
 #endif
@@ -651,7 +653,7 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
        int len = 4;
 
        if (strlen(str) == len) {
-               F2FS_OPTION(sbi).compress_level = 0;
+               F2FS_OPTION(sbi).compress_level = F2FS_ZSTD_DEFAULT_CLEVEL;
                return 0;
        }
 
@@ -664,7 +666,7 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
        if (kstrtouint(str + 1, 10, &level))
                return -EINVAL;
 
-       if (!level || level > zstd_max_clevel()) {
+       if (level < zstd_min_clevel() || level > zstd_max_clevel()) {
                f2fs_info(sbi, "invalid zstd compress level: %d", level);
                return -EINVAL;
        }