OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

f2fs: assign default compression level 

[ Upstream commit 00e120b5e4 ]

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>
This commit is contained in:
Jaegeuk Kim 2023-06-12 12:58:34 -07:00 committed by Greg Kroah-Hartman
parent 55d3f41e55
commit 1ff3f5ef28
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/compress.c
View File

@ -331,8 +331,6 @@ static const struct f2fs_compress_ops f2fs_lz4_ops = {
#endif #endif
#ifdef CONFIG_F2FS_FS_ZSTD #ifdef CONFIG_F2FS_FS_ZSTD
#define F2FS_ZSTD_DEFAULT_CLEVEL 1
static int zstd_init_compress_ctx(struct compress_ctx *cc) static int zstd_init_compress_ctx(struct compress_ctx *cc)
{ {
zstd_parameters params; zstd_parameters params;
@ -341,6 +339,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc)
unsigned int workspace_size; unsigned int workspace_size;
unsigned char level = F2FS_I(cc->inode)->i_compress_level; unsigned char level = F2FS_I(cc->inode)->i_compress_level;
/* Need to remain this for backward compatibility */
if (!level) if (!level)
level = F2FS_ZSTD_DEFAULT_CLEVEL; level = F2FS_ZSTD_DEFAULT_CLEVEL;

2
fs/f2fs/f2fs.h
View File

@ -1501,6 +1501,8 @@ struct compress_data {
#define F2FS_COMPRESSED_PAGE_MAGIC 0xF5F2C000 #define F2FS_COMPRESSED_PAGE_MAGIC 0xF5F2C000
#define F2FS_ZSTD_DEFAULT_CLEVEL 1
#define COMPRESS_LEVEL_OFFSET 8 #define COMPRESS_LEVEL_OFFSET 8
/* compress context */ /* compress context */

12
fs/f2fs/super.c
View File

@ -613,14 +613,12 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)
{ {
#ifdef CONFIG_F2FS_FS_LZ4HC #ifdef CONFIG_F2FS_FS_LZ4HC
unsigned int level; unsigned int level;
#endif
if (strlen(str) == 3) { if (strlen(str) == 3) {
F2FS_OPTION(sbi).compress_level = 0; F2FS_OPTION(sbi).compress_level = LZ4HC_DEFAULT_CLEVEL;
return 0; return 0;
} }
#ifdef CONFIG_F2FS_FS_LZ4HC
str += 3; str += 3;
if (str[0] != ':') { 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; F2FS_OPTION(sbi).compress_level = level;
return 0; return 0;
#else #else
if (strlen(str) == 3) {
F2FS_OPTION(sbi).compress_level = 0;
return 0;
}
f2fs_info(sbi, "kernel doesn't support lz4hc compression"); f2fs_info(sbi, "kernel doesn't support lz4hc compression");
return -EINVAL; return -EINVAL;
#endif #endif
@ -651,7 +653,7 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
int len = 4; int len = 4;
if (strlen(str) == len) { if (strlen(str) == len) {
F2FS_OPTION(sbi).compress_level = 0; F2FS_OPTION(sbi).compress_level = F2FS_ZSTD_DEFAULT_CLEVEL;
return 0; 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)) if (kstrtouint(str + 1, 10, &level))
return -EINVAL; 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); f2fs_info(sbi, "invalid zstd compress level: %d", level);
return -EINVAL; return -EINVAL;
} }