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

Commit bbf83779 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: clean up commit_inmem_pages() 



This patch moves error handling from commit_inmem_pages() into
__commit_inmem_page() for cleanup, no logic change.

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

fs/f2fs/segment.c

+22 −24
Original line number Diff line number Diff line
@@ -343,8 +343,7 @@ void drop_inmem_page(struct inode *inode, struct page *page) 
	trace_f2fs_commit_inmem_page(page, INMEM_INVALIDATE);

}



static int __commit_inmem_pages(struct inode *inode,

					struct list_head *revoke_list)

static int __commit_inmem_pages(struct inode *inode)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct f2fs_inode_info *fi = F2FS_I(inode);
@@ -357,9 +356,12 @@ static int __commit_inmem_pages(struct inode *inode, 
		.op_flags = REQ_SYNC | REQ_PRIO,

		.io_type = FS_DATA_IO,

	};

	struct list_head revoke_list;

	pgoff_t last_idx = ULONG_MAX;

	int err = 0;



	INIT_LIST_HEAD(&revoke_list);



	list_for_each_entry_safe(cur, tmp, &fi->inmem_pages, list) {

		struct page *page = cur->page;
@@ -393,14 +395,28 @@ retry: 
			last_idx = page->index;

		}

		unlock_page(page);

		list_move_tail(&cur->list, revoke_list);

		list_move_tail(&cur->list, &revoke_list);

	}



	if (last_idx != ULONG_MAX)

		f2fs_submit_merged_write_cond(sbi, inode, 0, last_idx, DATA);



	if (!err)

		__revoke_inmem_pages(inode, revoke_list, false, false);

	if (err) {

		/*

		 * try to revoke all committed pages, but still we could fail

		 * due to no memory or other reason, if that happened, EAGAIN

		 * will be returned, which means in such case, transaction is

		 * already not integrity, caller should use journal to do the

		 * recovery or rewrite & commit last transaction. For other

		 * error number, revoking was done by filesystem itself.

		 */

		err = __revoke_inmem_pages(inode, &revoke_list, false, true);



		/* drop all uncommitted pages */

		__revoke_inmem_pages(inode, &fi->inmem_pages, true, false);

	} else {

		__revoke_inmem_pages(inode, &revoke_list, false, false);

	}



	return err;

}
@@ -409,34 +425,16 @@ int commit_inmem_pages(struct inode *inode) 
{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct f2fs_inode_info *fi = F2FS_I(inode);

	struct list_head revoke_list;

	int err;



	INIT_LIST_HEAD(&revoke_list);

	f2fs_balance_fs(sbi, true);

	f2fs_lock_op(sbi);



	set_inode_flag(inode, FI_ATOMIC_COMMIT);



	mutex_lock(&fi->inmem_lock);

	err = __commit_inmem_pages(inode, &revoke_list);

	if (err) {

		int ret;

		/*

		 * try to revoke all committed pages, but still we could fail

		 * due to no memory or other reason, if that happened, EAGAIN

		 * will be returned, which means in such case, transaction is

		 * already not integrity, caller should use journal to do the

		 * recovery or rewrite & commit last transaction. For other

		 * error number, revoking was done by filesystem itself.

		 */

		ret = __revoke_inmem_pages(inode, &revoke_list, false, true);

		if (ret)

			err = ret;

	err = __commit_inmem_pages(inode);



		/* drop all uncommitted pages */

		__revoke_inmem_pages(inode, &fi->inmem_pages, true, false);

	}

	spin_lock(&sbi->inode_lock[ATOMIC_FILE]);

	if (!list_empty(&fi->inmem_ilist))

		list_del_init(&fi->inmem_ilist);