diff mbox series

f2fs: fix to set flush_merge opt and show noflush_merge

Message ID 20221026130504.26312-1-frank.li@vivo.com
State New
Headers
Series f2fs: fix to set flush_merge opt and show noflush_merge |

Commit Message

李扬韬 Oct. 26, 2022, 1:05 p.m. UTC 
  Some minor modifications to flush_merge and related parameters:

  1.The FLUSH_MERGE opt is set by default only in non-ro mode.
  2.When ro and merge are set at the same time, an error is reported.
  3.Display noflush_merge mount opt.

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

Comments

Chao Yu Oct. 29, 2022, 4:18 a.m. UTC | #1 
On 2022/10/26 21:05, Yangtao Li via Linux-f2fs-devel wrote:
> Some minor modifications to flush_merge and related parameters:
> 
>    1.The FLUSH_MERGE opt is set by default only in non-ro mode.
>    2.When ro and merge are set at the same time, an error is reported.
>    3.Display noflush_merge mount opt.
> 
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
>   fs/f2fs/super.c | 13 +++++++++++--
>   1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 3834ead04620..475fa10c6007 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -1347,6 +1347,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
>   		return -EINVAL;
>   	}
>   
> +	if ((f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb))
> +		 && test_opt(sbi, FLUSH_MERGE)) {

One more blank before &&.

> +		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
> +		return -EINVAL;
> +	}
> +
>   	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
>   		f2fs_err(sbi, "Allow to mount readonly mode only");
>   		return -EROFS;
> @@ -1935,8 +1941,10 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
>   		seq_puts(seq, ",inline_dentry");
>   	else
>   		seq_puts(seq, ",noinline_dentry");
> -	if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE))
> +	if (test_opt(sbi, FLUSH_MERGE))
>   		seq_puts(seq, ",flush_merge");
> +	else
> +		seq_puts(seq, ",noflush_merge");
>   	if (test_opt(sbi, NOBARRIER))
>   		seq_puts(seq, ",nobarrier");
>   	if (test_opt(sbi, FASTBOOT))
> @@ -2065,7 +2073,8 @@ static void default_options(struct f2fs_sb_info *sbi)
>   	set_opt(sbi, MERGE_CHECKPOINT);
>   	F2FS_OPTION(sbi).unusable_cap = 0;
>   	sbi->sb->s_flags |= SB_LAZYTIME;
> -	set_opt(sbi, FLUSH_MERGE);
> +	if (!(f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)))

How about using more explicit condition?

if (!f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)))

> +		set_opt(sbi, FLUSH_MERGE);
>   	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
>   		set_opt(sbi, DISCARD);
>   	if (f2fs_sb_has_blkzoned(sbi)) {
diff mbox series

Patch

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 3834ead04620..475fa10c6007 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1347,6 +1347,12 @@  static int parse_options(struct super_block *sb, char *options, bool is_remount)
 		return -EINVAL;
 	}
 
+	if ((f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb))
+		 && test_opt(sbi, FLUSH_MERGE)) {
+		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
+		return -EINVAL;
+	}
+
 	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
 		f2fs_err(sbi, "Allow to mount readonly mode only");
 		return -EROFS;
@@ -1935,8 +1941,10 @@  static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
 		seq_puts(seq, ",inline_dentry");
 	else
 		seq_puts(seq, ",noinline_dentry");
-	if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE))
+	if (test_opt(sbi, FLUSH_MERGE))
 		seq_puts(seq, ",flush_merge");
+	else
+		seq_puts(seq, ",noflush_merge");
 	if (test_opt(sbi, NOBARRIER))
 		seq_puts(seq, ",nobarrier");
 	if (test_opt(sbi, FASTBOOT))
@@ -2065,7 +2073,8 @@  static void default_options(struct f2fs_sb_info *sbi)
 	set_opt(sbi, MERGE_CHECKPOINT);
 	F2FS_OPTION(sbi).unusable_cap = 0;
 	sbi->sb->s_flags |= SB_LAZYTIME;
-	set_opt(sbi, FLUSH_MERGE);
+	if (!(f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)))
+		set_opt(sbi, FLUSH_MERGE);
 	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
 		set_opt(sbi, DISCARD);
 	if (f2fs_sb_has_blkzoned(sbi)) {