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

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

f2fs: move write_node_page above fsync_node_pages 



This patch just moves write_node_page and introduces an inner function.

Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c1b22107

fs/f2fs/node.c

+73 −67
Original line number Diff line number Diff line
@@ -1318,6 +1318,78 @@ static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino) 
	return last_page;

}



static int __write_node_page(struct page *page,

				struct writeback_control *wbc)

{

	struct f2fs_sb_info *sbi = F2FS_P_SB(page);

	nid_t nid;

	struct node_info ni;

	struct f2fs_io_info fio = {

		.sbi = sbi,

		.type = NODE,

		.op = REQ_OP_WRITE,

		.op_flags = wbc_to_write_flags(wbc),

		.page = page,

		.encrypted_page = NULL,

	};



	trace_f2fs_writepage(page, NODE);



	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto redirty_out;

	if (unlikely(f2fs_cp_error(sbi)))

		goto redirty_out;



	/* get old block addr of this node page */

	nid = nid_of_node(page);

	f2fs_bug_on(sbi, page->index != nid);



	if (wbc->for_reclaim) {

		if (!down_read_trylock(&sbi->node_write))

			goto redirty_out;

	} else {

		down_read(&sbi->node_write);

	}



	get_node_info(sbi, nid, &ni);



	/* This page is already truncated */

	if (unlikely(ni.blk_addr == NULL_ADDR)) {

		ClearPageUptodate(page);

		dec_page_count(sbi, F2FS_DIRTY_NODES);

		up_read(&sbi->node_write);

		unlock_page(page);

		return 0;

	}



	set_page_writeback(page);

	fio.old_blkaddr = ni.blk_addr;

	write_node_page(nid, &fio);

	set_node_addr(sbi, &ni, fio.new_blkaddr, is_fsync_dnode(page));

	dec_page_count(sbi, F2FS_DIRTY_NODES);

	up_read(&sbi->node_write);



	if (wbc->for_reclaim)

		f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, NODE, WRITE);



	unlock_page(page);



	if (unlikely(f2fs_cp_error(sbi)))

		f2fs_submit_merged_bio(sbi, NODE, WRITE);



	return 0;



redirty_out:

	redirty_page_for_writepage(wbc, page);

	return AOP_WRITEPAGE_ACTIVATE;

}



static int f2fs_write_node_page(struct page *page,

				struct writeback_control *wbc)

{

	return __write_node_page(page, wbc);

}



int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,

			struct writeback_control *wbc, bool atomic)

{
@@ -1397,7 +1469,7 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, 
			if (!clear_page_dirty_for_io(page))

				goto continue_unlock;



			ret = NODE_MAPPING(sbi)->a_ops->writepage(page, wbc);

			ret = __write_node_page(page, wbc);

			if (ret) {

				unlock_page(page);

				f2fs_put_page(last_page, 0);
@@ -1577,72 +1649,6 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) 
	return ret;

}



static int f2fs_write_node_page(struct page *page,

				struct writeback_control *wbc)

{

	struct f2fs_sb_info *sbi = F2FS_P_SB(page);

	nid_t nid;

	struct node_info ni;

	struct f2fs_io_info fio = {

		.sbi = sbi,

		.type = NODE,

		.op = REQ_OP_WRITE,

		.op_flags = wbc_to_write_flags(wbc),

		.page = page,

		.encrypted_page = NULL,

	};



	trace_f2fs_writepage(page, NODE);



	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto redirty_out;

	if (unlikely(f2fs_cp_error(sbi)))

		goto redirty_out;



	/* get old block addr of this node page */

	nid = nid_of_node(page);

	f2fs_bug_on(sbi, page->index != nid);



	if (wbc->for_reclaim) {

		if (!down_read_trylock(&sbi->node_write))

			goto redirty_out;

	} else {

		down_read(&sbi->node_write);

	}



	get_node_info(sbi, nid, &ni);



	/* This page is already truncated */

	if (unlikely(ni.blk_addr == NULL_ADDR)) {

		ClearPageUptodate(page);

		dec_page_count(sbi, F2FS_DIRTY_NODES);

		up_read(&sbi->node_write);

		unlock_page(page);

		return 0;

	}



	set_page_writeback(page);

	fio.old_blkaddr = ni.blk_addr;

	write_node_page(nid, &fio);

	set_node_addr(sbi, &ni, fio.new_blkaddr, is_fsync_dnode(page));

	dec_page_count(sbi, F2FS_DIRTY_NODES);

	up_read(&sbi->node_write);



	if (wbc->for_reclaim)

		f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, NODE, WRITE);



	unlock_page(page);



	if (unlikely(f2fs_cp_error(sbi)))

		f2fs_submit_merged_bio(sbi, NODE, WRITE);



	return 0;



redirty_out:

	redirty_page_for_writepage(wbc, page);

	return AOP_WRITEPAGE_ACTIVATE;

}



static int f2fs_write_node_pages(struct address_space *mapping,

			    struct writeback_control *wbc)

{