Commit 2bda542d authored Feb 27, 2015 by Wanpeng Li Committed by Jaegeuk Kim Apr 10, 2015

f2fs: fix block_ops trace point

block operations is used to flush all dirty node and dentry blocks in
the page cache and suspend ordinary writing activities, however, there
are some facts such like cp error or mount read-only etc which lead to
block operations can't be invoked. Current trace point print block_ops
start premature even if block_ops doesn't have opportunity to execute.
This patch fix it by move block_ops trace point just before block_ops.

Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent b7f204cc

fs/f2fs/checkpoint.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1047,8 +1047,6 @@ void write_checkpoint(struct f2fs_sb_info sbi, struct cp_control cpc)
		struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
		unsigned long long ckpt_ver;

		trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "start block_ops");

		mutex_lock(&sbi->cp_mutex);

		if (!is_sbi_flag_set(sbi, SBI_IS_DIRTY) &&
		@@ -1058,6 +1056,9 @@ void write_checkpoint(struct f2fs_sb_info sbi, struct cp_control cpc)
		goto out;
		if (f2fs_readonly(sbi->sb))
		goto out;

		trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "start block_ops");

		if (block_operations(sbi))
		goto out;

Admin message