f2fs: assign default compression level
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: assign default compression level
Let's avoid any confusion from assigning compress_level=0 for LZ4HC and ZSTD.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/compress.c | 3 +-- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/super.c | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-)
fs/f2fs/compress.c +1 -2
@@ -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 ;
fs/f2fs/f2fs.h +2 -0
@@ -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 */
fs/f2fs/super.c +7 -5
@@ -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 ; }
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 8 lines · On Mon, 12 Jun 2023 13:16:26 -0700 you wrote:
Let's avoid any confusion from assigning compress_level=0 for LZ4HC and ZSTD.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/compress.c | 3 +-- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/super.c | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-)
Here is the summary with links:
- [f2fs-dev] f2fs: assign default compression level
https://git.kernel.org/jaegeuk/f2fs/c/e59031a552b5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html