From: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
commit acff9409dd40beaca2bd982678d222e2740ad84b upstream.
This reverts commit 54f43a10fa257ad4af02a1d157fefef6ebcfa7dc.
The above commit broke the lazytime mount, given
mount("/dev/vdb", "/mnt/test", "f2fs", 0, "lazytime");
CC: stable@xxxxxxxxxxxxxxx # 6.11+
Signed-off-by: Daniel Rosenberg <drosen@xxxxxxxxxx>
Reviewed-by: Chao Yu <chao@xxxxxxxxxx>
Signed-off-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/f2fs/super.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -151,6 +151,8 @@ enum {
Opt_mode,
Opt_fault_injection,
Opt_fault_type,
+ Opt_lazytime,
+ Opt_nolazytime,
Opt_quota,
Opt_noquota,
Opt_usrquota,
@@ -227,6 +229,8 @@ static match_table_t f2fs_tokens = {
{Opt_mode, "mode=%s"},
{Opt_fault_injection, "fault_injection=%u"},
{Opt_fault_type, "fault_type=%u"},
+ {Opt_lazytime, "lazytime"},
+ {Opt_nolazytime, "nolazytime"},
{Opt_quota, "quota"},
{Opt_noquota, "noquota"},
{Opt_usrquota, "usrquota"},
@@ -919,6 +923,12 @@ static int parse_options(struct super_bl
f2fs_info(sbi, "fault_type options not supported");
break;
#endif
+ case Opt_lazytime:
+ sb->s_flags |= SB_LAZYTIME;
+ break;
+ case Opt_nolazytime:
+ sb->s_flags &= ~SB_LAZYTIME;
+ break;
#ifdef CONFIG_QUOTA
case Opt_quota:
case Opt_usrquota:
Patches currently in stable-queue which might be from jaegeuk@xxxxxxxxxx are
queue-6.11/f2fs-fix-not-used-variable-index.patch
queue-6.11/f2fs-fix-to-avoid-forcing-direct-write-to-use-buffer.patch
queue-6.11/f2fs-fix-to-avoid-potential-deadlock-in-f2fs_record_.patch
queue-6.11/f2fs-compress-fix-inconsistent-update-of-i_blocks-in.patch
queue-6.11/f2fs-fix-to-do-cast-in-f2fs_-blk_to_bytes-btyes_to_b.patch
queue-6.11/f2fs-check-curseg-inited-before-write_sum_page-in-ch.patch
queue-6.11/f2fs-fix-to-map-blocks-correctly-for-direct-write.patch
queue-6.11/f2fs-fix-null-ptr-deref-in-f2fs_submit_page_bio.patch
queue-6.11/f2fs-fix-to-avoid-use-gc_at-when-setting-gc_mode-as-.patch
queue-6.11/f2fs-fix-fiemap-failure-issue-when-page-size-is-16kb.patch
queue-6.11/f2fs-fix-the-wrong-f2fs_bug_on-condition-in-f2fs_do_.patch
queue-6.11/f2fs-clean-up-val-f2fs_blksize_bits.patch
queue-6.11/revert-f2fs-remove-unreachable-lazytime-mount-option-parsing.patch
queue-6.11/f2fs-fix-to-account-dirty-data-in-__get_secs_require.patch
queue-6.11/f2fs-fix-race-in-concurrent-f2fs_stop_gc_thread.patch
