Re: [PATCH] f2fs: fix wrong option name printed by parse_options()

[Chao Yu]

On 2021/8/25 1:26, Jaegeuk Kim wrote:
> On 08/24, Chao Yu wrote:
> > It prints below kernel message during mounting w/ checkpoint=disable
> > option:
> >
> > "F2FS-fs (pmem0): checkpoint=merge cannot be used with checkpoint=disable"
> >
> > Fix typo "checkpoint=merge" w/ "checkpoint_merge"
> >
> > Signed-off-by: Chao Yu <chao@xxxxxxxxxx>
> > ---
> >   fs/f2fs/super.c | 6 ++++++
> >   1 file changed, 6 insertions(+)
> >
> > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > index 49e153fd8183..88c66e46bd5c 100644
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
> > @@ -1289,6 +1289,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
> >   		return -EINVAL;
> >   	}
> >   
> > +	if (test_opt(sbi, DISABLE_CHECKPOINT) &&
> > +			test_opt(sbi, MERGE_CHECKPOINT)) {
> > +		f2fs_err(sbi, "checkpoint_merge cannot be used with checkpoint=disable\n");
> > +		return -EINVAL;
>
> What about disabling MERGE_CHECKPOINT autmatically?

checkpoint_merge was introduced separately rather than adding a new "merge"
parameter in mount option "checkpoint=%s", so they are compatible.

Please ignore this patch...

Thanks,

> > +	}
> > +
> >   	/* Not pass down write hints if the number of active logs is lesser
> >   	 * than NR_CURSEG_PERSIST_TYPE.
> >   	 */
> > --
> > 2.32.0