[RESEND] f2fs: set default compress option only when sb_has_compression

Message ID 20230330165648.33907-1-frank.li@vivo.com
State New
Headers
Series [RESEND] f2fs: set default compress option only when sb_has_compression |

Commit Message

李扬韬 March 30, 2023, 4:56 p.m. UTC
  If the compress feature is not enabled, there is no need to set
compress-related parameters.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
  

Comments

Chao Yu April 5, 2023, 2:51 a.m. UTC | #1
On 2023/3/31 0:56, Yangtao Li wrote:
> If the compress feature is not enabled, there is no need to set
> compress-related parameters.
> 
> Signed-off-by: Yangtao Li <frank.li@vivo.com>

Patch looks fine, but it's better to fix similar issues in one
patch.

e.g.
f2fs: add compression feature check for all compress mount opt

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,

> ---
>   fs/f2fs/super.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 768be1c76a47..b5828a67f7c1 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -2073,10 +2073,12 @@ static void default_options(struct f2fs_sb_info *sbi)
>   	F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX;
>   	F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID);
>   	F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID);
> -	F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4;
> -	F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE;
> -	F2FS_OPTION(sbi).compress_ext_cnt = 0;
> -	F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;
> +	if (f2fs_sb_has_compression(sbi)) {
> +		F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4;
> +		F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE;
> +		F2FS_OPTION(sbi).compress_ext_cnt = 0;
> +		F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;
> +	}
>   	F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_ON;
>   	F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL;
>
  
patchwork-bot+f2fs@kernel.org April 5, 2023, 4:20 p.m. UTC | #2
Hello:

This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <jaegeuk@kernel.org>:

On Fri, 31 Mar 2023 00:56:48 +0800 you wrote:
> If the compress feature is not enabled, there is no need to set
> compress-related parameters.
> 
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
>  fs/f2fs/super.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

Here is the summary with links:
  - [f2fs-dev,RESEND] f2fs: set default compress option only when sb_has_compression
    https://git.kernel.org/jaegeuk/f2fs/c/338abb312bb2

You are awesome, thank you!
  

Patch

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 768be1c76a47..b5828a67f7c1 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2073,10 +2073,12 @@  static void default_options(struct f2fs_sb_info *sbi)
 	F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX;
 	F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID);
 	F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID);
-	F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4;
-	F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE;
-	F2FS_OPTION(sbi).compress_ext_cnt = 0;
-	F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;
+	if (f2fs_sb_has_compression(sbi)) {
+		F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4;
+		F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE;
+		F2FS_OPTION(sbi).compress_ext_cnt = 0;
+		F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;
+	}
 	F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_ON;
 	F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL;