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

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

f2fs: pass checkpoint reason on roll-forward recovery 



This patch adds CP_RECOVERY to remain recovery information for checkpoint.
And, it makes sure writing checkpoint in this case.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent feb7cbb0

fs/f2fs/checkpoint.c

+5 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ void write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	mutex_lock(&sbi->cp_mutex);



	if (!is_sbi_flag_set(sbi, SBI_IS_DIRTY) &&

			cpc->reason != CP_DISCARD && cpc->reason != CP_UMOUNT)

		(cpc->reason == CP_FASTBOOT || cpc->reason == CP_SYNC))

		goto out;

	if (unlikely(f2fs_cp_error(sbi)))

		goto out;
@@ -1086,6 +1086,10 @@ void write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 


	unblock_operations(sbi);

	stat_inc_cp_count(sbi->stat_info);



	if (cpc->reason == CP_RECOVERY)

		f2fs_msg(sbi->sb, KERN_NOTICE,

			"checkpoint: version = %llx", ckpt_ver);

out:

	mutex_unlock(&sbi->cp_mutex);

	trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "finish checkpoint");

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ enum { 
	CP_UMOUNT,

	CP_FASTBOOT,

	CP_SYNC,

	CP_RECOVERY,

	CP_DISCARD,

};

fs/f2fs/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi) 
		mutex_unlock(&sbi->cp_mutex);

	} else if (need_writecp) {

		struct cp_control cpc = {

			.reason = CP_SYNC,

			.reason = CP_RECOVERY,

		};

		mutex_unlock(&sbi->cp_mutex);

		write_checkpoint(sbi, &cpc);

include/trace/events/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
		{ CP_UMOUNT,	"Umount" },				\

		{ CP_FASTBOOT,	"Fastboot" },				\

		{ CP_SYNC,	"Sync" },				\

		{ CP_RECOVERY,	"Recovery" },				\

		{ CP_DISCARD,	"Discard" })



struct victim_sel_policy;