LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] f2fs: fix wrong option name printed by parse_options()
@ 2021-08-24  1:19 Chao Yu
  2021-08-24  1:31 ` Chao Yu
  2021-08-24 17:26 ` Jaegeuk Kim
  0 siblings, 2 replies; 4+ messages in thread
From: Chao Yu @ 2021-08-24  1:19 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu, Chao Yu

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@kernel.org>
---
 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;
+	}
+
 	/* Not pass down write hints if the number of active logs is lesser
 	 * than NR_CURSEG_PERSIST_TYPE.
 	 */
-- 
2.32.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] f2fs: fix wrong option name printed by parse_options()
  2021-08-24  1:19 [PATCH] f2fs: fix wrong option name printed by parse_options() Chao Yu
@ 2021-08-24  1:31 ` Chao Yu
  2021-08-24 17:26 ` Jaegeuk Kim
  1 sibling, 0 replies; 4+ messages in thread
From: Chao Yu @ 2021-08-24  1:31 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

On 2021/8/24 9:19, 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"

Oops, this message should have been removed by

"f2fs: rename checkpoint=merge mount option to checkpoint_merge"

I may used old f2fs module, please ignore this...

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] f2fs: fix wrong option name printed by parse_options()
  2021-08-24  1:19 [PATCH] f2fs: fix wrong option name printed by parse_options() Chao Yu
  2021-08-24  1:31 ` Chao Yu
@ 2021-08-24 17:26 ` Jaegeuk Kim
  2021-08-24 23:35   ` Chao Yu
  1 sibling, 1 reply; 4+ messages in thread
From: Jaegeuk Kim @ 2021-08-24 17:26 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

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@kernel.org>
> ---
>  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?

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] f2fs: fix wrong option name printed by parse_options()
  2021-08-24 17:26 ` Jaegeuk Kim
@ 2021-08-24 23:35   ` Chao Yu
  0 siblings, 0 replies; 4+ messages in thread
From: Chao Yu @ 2021-08-24 23:35 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel, 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@kernel.org>
>> ---
>>   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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-08-24 23:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24  1:19 [PATCH] f2fs: fix wrong option name printed by parse_options() Chao Yu
2021-08-24  1:31 ` Chao Yu
2021-08-24 17:26 ` Jaegeuk Kim
2021-08-24 23:35   ` Chao Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).