diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2026-01-17 00:50:44 +0300 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2026-01-20 23:54:14 +0300 |
| commit | 993663874be557a80d4cdc9700b760bb6d27c098 (patch) | |
| tree | dba9eaa88c7da2c7fb611b6d6f67e248906e44ae | |
| parent | a5d8b9d94e1863f3ebb7182c238b2c713f6f4efd (diff) | |
| download | linux-993663874be557a80d4cdc9700b760bb6d27c098.tar.xz | |
Revert "f2fs: add timeout in f2fs_enable_checkpoint()"
This reverts commit 4bc347779698b5e67e1514bab105c2c083e55502.
Let's apply a better approach to flush the only dirty pages committed by user
to avoid the delay caused by unncessary incoming ones.
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/f2fs.h | 2 | ||||
| -rw-r--r-- | fs/f2fs/super.c | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index d41210a381cd..035239758e33 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -311,7 +311,6 @@ enum { #define DEF_CP_INTERVAL 60 /* 60 secs */ #define DEF_IDLE_INTERVAL 5 /* 5 secs */ #define DEF_DISABLE_INTERVAL 5 /* 5 secs */ -#define DEF_ENABLE_INTERVAL 16 /* 16 secs */ #define DEF_DISABLE_QUICK_INTERVAL 1 /* 1 secs */ #define DEF_UMOUNT_DISCARD_TIMEOUT 5 /* 5 secs */ @@ -1486,7 +1485,6 @@ enum { DISCARD_TIME, GC_TIME, DISABLE_TIME, - ENABLE_TIME, UMOUNT_DISCARD_TIMEOUT, MAX_TIME, }; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1660d663a8c5..97c2264ec7fe 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2686,7 +2686,7 @@ restore_flag: static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi) { - unsigned int nr_pages = get_pages(sbi, F2FS_DIRTY_DATA) / 16; + int retry = DEFAULT_RETRY_IO_COUNT; long long start, writeback, end; int ret; struct f2fs_lock_context lc; @@ -2696,22 +2696,16 @@ static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi) get_pages(sbi, F2FS_DIRTY_NODES), get_pages(sbi, F2FS_DIRTY_DATA)); - f2fs_update_time(sbi, ENABLE_TIME); - start = ktime_get(); /* we should flush all the data to keep data consistency */ - while (get_pages(sbi, F2FS_DIRTY_DATA)) { - writeback_inodes_sb_nr(sbi->sb, nr_pages, WB_REASON_SYNC); + do { + sync_inodes_sb(sbi->sb); f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT); + } while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--); - if (f2fs_time_over(sbi, ENABLE_TIME)) - break; - } writeback = ktime_get(); - sync_inodes_sb(sbi->sb); - if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA))) f2fs_warn(sbi, "checkpoint=enable has some unwritten data: %lld", get_pages(sbi, F2FS_DIRTY_DATA)); @@ -4333,7 +4327,6 @@ static void init_sb_info(struct f2fs_sb_info *sbi) sbi->interval_time[DISCARD_TIME] = DEF_IDLE_INTERVAL; sbi->interval_time[GC_TIME] = DEF_IDLE_INTERVAL; sbi->interval_time[DISABLE_TIME] = DEF_DISABLE_INTERVAL; - sbi->interval_time[ENABLE_TIME] = DEF_ENABLE_INTERVAL; sbi->interval_time[UMOUNT_DISCARD_TIMEOUT] = DEF_UMOUNT_DISCARD_TIMEOUT; clear_sbi_flag(sbi, SBI_NEED_FSCK); |