f2fs: make LAZYTIME a mount option flag

Set LAZYTIME into sbi during parsing, and transfer it to the sb in
fill_super, so that an sb is not required during option parsing.

(Note: While lazytime is normally handled via mount flag in the vfs,
some f2fs users do expect to be able to use it as an explicit mount
option string via the mount syscall, so this option must remain.)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Eric Sandeen
2025-03-03 11:12:15 -06:00
committed by Jaegeuk Kim
parent 7d6ee50330
commit 9100adf326
2 changed files with 13 additions and 3 deletions
+5
View File
@@ -117,6 +117,11 @@ extern const char *f2fs_fault_name[FAULT_MAX];
#define F2FS_MOUNT_AGE_EXTENT_CACHE 0x08000000
#define F2FS_MOUNT_NAT_BITS 0x10000000
#define F2FS_MOUNT_INLINECRYPT 0x20000000
/*
* Some f2fs environments expect to be able to pass the "lazytime" option
* string rather than using the MS_LAZYTIME flag, so this must remain.
*/
#define F2FS_MOUNT_LAZYTIME 0x40000000
#define F2FS_OPTION(sbi) ((sbi)->mount_opt)
#define clear_opt(sbi, option) (F2FS_OPTION(sbi).opt &= ~F2FS_MOUNT_##option)
+8 -3
View File
@@ -920,10 +920,10 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
break;
#endif
case Opt_lazytime:
sb->s_flags |= SB_LAZYTIME;
set_opt(sbi, LAZYTIME);
break;
case Opt_nolazytime:
sb->s_flags &= ~SB_LAZYTIME;
clear_opt(sbi, LAZYTIME);
break;
#ifdef CONFIG_QUOTA
case Opt_quota:
@@ -2186,8 +2186,8 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount)
set_opt(sbi, INLINE_DATA);
set_opt(sbi, INLINE_DENTRY);
set_opt(sbi, MERGE_CHECKPOINT);
set_opt(sbi, LAZYTIME);
F2FS_OPTION(sbi).unusable_cap = 0;
sbi->sb->s_flags |= SB_LAZYTIME;
if (!f2fs_is_readonly(sbi))
set_opt(sbi, FLUSH_MERGE);
if (f2fs_sb_has_blkzoned(sbi))
@@ -4588,6 +4588,11 @@ try_onemore:
if (test_opt(sbi, INLINECRYPT))
sb->s_flags |= SB_INLINECRYPT;
if (test_opt(sbi, LAZYTIME))
sb->s_flags |= SB_LAZYTIME;
else
sb->s_flags &= ~SB_LAZYTIME;
super_set_uuid(sb, (void *) raw_super->uuid, sizeof(raw_super->uuid));
super_set_sysfs_name_bdev(sb);
sb->s_iflags |= SB_I_CGROUPWB;