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

Commit d31c7c3f authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim
Browse files

f2fs: fix missing skip pages info 



fix missing skip pages info in f2fs_writepages trace event.

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0c3a5797

fs/f2fs/checkpoint.c

+3 −2
Original line number Diff line number Diff line
@@ -256,13 +256,13 @@ static int f2fs_write_meta_pages(struct address_space *mapping, 
	struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);

	long diff, written;



	trace_f2fs_writepages(mapping->host, wbc, META);



	/* collect a number of dirty meta pages and write together */

	if (wbc->for_kupdate ||

		get_pages(sbi, F2FS_DIRTY_META) < nr_pages_to_skip(sbi, META))

		goto skip_write;



	trace_f2fs_writepages(mapping->host, wbc, META);



	/* if mounting is failed, skip writing node pages */

	mutex_lock(&sbi->cp_mutex);

	diff = nr_pages_to_write(sbi, META, wbc);
@@ -273,6 +273,7 @@ static int f2fs_write_meta_pages(struct address_space *mapping, 


skip_write:

	wbc->pages_skipped += get_pages(sbi, F2FS_DIRTY_META);

	trace_f2fs_writepages(mapping->host, wbc, META);

	return 0;

}

fs/f2fs/data.c

+3 −2
Original line number Diff line number Diff line
@@ -1341,8 +1341,6 @@ static int f2fs_write_data_pages(struct address_space *mapping, 
	int ret;

	long diff;



	trace_f2fs_writepages(mapping->host, wbc, DATA);



	/* deal with chardevs and other special file */

	if (!mapping->a_ops->writepage)

		return 0;
@@ -1364,6 +1362,8 @@ static int f2fs_write_data_pages(struct address_space *mapping, 
	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto skip_write;



	trace_f2fs_writepages(mapping->host, wbc, DATA);



	diff = nr_pages_to_write(sbi, DATA, wbc);



	if (!S_ISDIR(inode->i_mode) && wbc->sync_mode == WB_SYNC_ALL) {
@@ -1382,6 +1382,7 @@ static int f2fs_write_data_pages(struct address_space *mapping, 


skip_write:

	wbc->pages_skipped += get_dirty_pages(inode);

	trace_f2fs_writepages(mapping->host, wbc, DATA);

	return 0;

}

fs/f2fs/node.c

+3 −2
Original line number Diff line number Diff line
@@ -1460,8 +1460,6 @@ static int f2fs_write_node_pages(struct address_space *mapping, 
	struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);

	long diff;



	trace_f2fs_writepages(mapping->host, wbc, NODE);



	/* balancing f2fs's metadata in background */

	f2fs_balance_fs_bg(sbi);
@@ -1469,6 +1467,8 @@ static int f2fs_write_node_pages(struct address_space *mapping, 
	if (get_pages(sbi, F2FS_DIRTY_NODES) < nr_pages_to_skip(sbi, NODE))

		goto skip_write;



	trace_f2fs_writepages(mapping->host, wbc, NODE);



	diff = nr_pages_to_write(sbi, NODE, wbc);

	wbc->sync_mode = WB_SYNC_NONE;

	sync_node_pages(sbi, 0, wbc);
@@ -1477,6 +1477,7 @@ static int f2fs_write_node_pages(struct address_space *mapping, 


skip_write:

	wbc->pages_skipped += get_pages(sbi, F2FS_DIRTY_NODES);

	trace_f2fs_writepages(mapping->host, wbc, NODE);

	return 0;

}