f2fs: assign default compression level

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

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 1132d3c..438af59 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -317,8 +317,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;
@@ -327,6 +325,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 5582a93..9481108 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1440,6 +1440,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 8efbb2e..a3695ad 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -589,14 +589,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] != ':') {
@@ -614,6 +612,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
@@ -627,7 +629,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;
        }
 
@@ -640,7 +642,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;
        }