evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f2fs: clean up commit_inmem_pages()

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

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2018-04-23 10:36:14 +08:00 • committed by Jaegeuk Kim
parent 7aff5c69da
commit b025f6dfc0
1 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
fs/f2fs/segment.c
View file

@ -343,8 +343,7 @@ void drop_inmem_page(struct inode *inode, struct page *page)
trace_f2fs_commit_inmem_page(page, INMEM_INVALIDATE); trace_f2fs_commit_inmem_page(page, INMEM_INVALIDATE);
} }
static int __commit_inmem_pages(struct inode *inode, static int __commit_inmem_pages(struct inode *inode)
struct list_head *revoke_list)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
struct f2fs_inode_info *fi = F2FS_I(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, .op_flags = REQ_SYNC | REQ_PRIO,
.io_type = FS_DATA_IO, .io_type = FS_DATA_IO,
}; };
struct list_head revoke_list;
pgoff_t last_idx = ULONG_MAX; pgoff_t last_idx = ULONG_MAX;
int err = 0; int err = 0;
INIT_LIST_HEAD(&revoke_list);
list_for_each_entry_safe(cur, tmp, &fi->inmem_pages, list) { list_for_each_entry_safe(cur, tmp, &fi->inmem_pages, list) {
struct page *page = cur->page; struct page *page = cur->page;
@ -393,35 +395,13 @@ retry:
last_idx = page->index; last_idx = page->index;
} }
unlock_page(page); unlock_page(page);
list_move_tail(&cur->list, revoke_list); list_move_tail(&cur->list, &revoke_list);
} }
if (last_idx != ULONG_MAX) if (last_idx != ULONG_MAX)
f2fs_submit_merged_write_cond(sbi, inode, 0, last_idx, DATA); f2fs_submit_merged_write_cond(sbi, inode, 0, last_idx, DATA);
if (!err)
__revoke_inmem_pages(inode, revoke_list, false, false);
return err;
}
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) { if (err) {
int ret;
/* /*
* try to revoke all committed pages, but still we could fail * try to revoke all committed pages, but still we could fail
* due to no memory or other reason, if that happened, EAGAIN * due to no memory or other reason, if that happened, EAGAIN
@ -430,13 +410,31 @@ int commit_inmem_pages(struct inode *inode)
* recovery or rewrite & commit last transaction. For other * recovery or rewrite & commit last transaction. For other
* error number, revoking was done by filesystem itself. * error number, revoking was done by filesystem itself.
*/ */
ret = __revoke_inmem_pages(inode, &revoke_list, false, true); err = __revoke_inmem_pages(inode, &revoke_list, false, true);
if (ret)
err = ret;
/* drop all uncommitted pages */ /* drop all uncommitted pages */
__revoke_inmem_pages(inode, &fi->inmem_pages, true, false); __revoke_inmem_pages(inode, &fi->inmem_pages, true, false);
} else {
__revoke_inmem_pages(inode, &revoke_list, false, false);
} }
return err;
}
int commit_inmem_pages(struct inode *inode)
{
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
struct f2fs_inode_info *fi = F2FS_I(inode);
int err;
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);
spin_lock(&sbi->inode_lock[ATOMIC_FILE]); spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
if (!list_empty(&fi->inmem_ilist)) if (!list_empty(&fi->inmem_ilist))
list_del_init(&fi->inmem_ilist); list_del_init(&fi->inmem_ilist);