Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f711e743 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

UPSTREAM: f2fs: guarantee to write dirty data when enabling checkpoint back 



We must flush all the dirty data when enabling checkpoint back. Let's guarantee
that first by adding a retry logic on sync_inodes_sb(). In addition to that,
this patch adds to flush data in fsync when checkpoint is disabled, which can
mitigate the sync_inodes_sb() failures in advance.

Bug: 194449609
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit dddd3d65293a52c2c3850c19b1e5115712e534d8)
Change-Id: I5bbef7386ddbb44fd925262fb68a8ef0a4960993
(cherry picked from commit 90c60a51f510da64554abe9c6b748ed624543192)
parent d7b2931c

fs/f2fs/file.c

+2 −3
Original line number Diff line number Diff line
@@ -260,8 +260,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, 
	};

	unsigned int seq_id = 0;



	if (unlikely(f2fs_readonly(inode->i_sb) ||

				is_sbi_flag_set(sbi, SBI_CP_DISABLED)))

	if (unlikely(f2fs_readonly(inode->i_sb)))

		return 0;



	trace_f2fs_sync_file_enter(inode);
@@ -275,7 +274,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, 
	ret = file_write_and_wait_range(file, start, end);

	clear_inode_flag(inode, FI_NEED_IPU);



	if (ret) {

	if (ret || is_sbi_flag_set(sbi, SBI_CP_DISABLED)) {

		trace_f2fs_sync_file_exit(inode, cp_reason, datasync, ret);

		return ret;

	}

fs/f2fs/super.c

+10 −1
Original line number Diff line number Diff line
@@ -1780,8 +1780,17 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi) 


static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)

{

	int retry = DEFAULT_RETRY_IO_COUNT;



	/* we should flush all the data to keep data consistency */

	do {

		sync_inodes_sb(sbi->sb);

		cond_resched();

		congestion_wait(BLK_RW_ASYNC, DEFAULT_IO_TIMEOUT);

	} while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--);



	if (unlikely(retry < 0))

		f2fs_warn(sbi, "checkpoint=enable has some unwritten data.");



	down_write(&sbi->gc_lock);

	f2fs_dirty_to_prefree(sbi);