AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ocfs2: fix journal commit deadlock in ocfs2_convert_inline_data_to_extents

Browse Source 
Similar to ocfs2_write_end_nolock() which is metioned at commit
136f49b917 ("ocfs2: fix journal commit deadlock"), we should unlock
pages before ocfs2_commit_trans() in ocfs2_convert_inline_data_to_extents.

Otherwise, it will cause a deadlock with journal commit threads.

Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
alex chen 2015-02-10 14:09:02 -08:00 committed by Linus Torvalds
parent 95671c63d5
commit 15eba0fe3e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/ocfs2/alloc.c
View File

@ -6873,7 +6873,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
if (IS_ERR(handle)) {
ret = PTR_ERR(handle);
mlog_errno(ret);
goto out_unlock;
goto out;
}
ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
@ -6931,7 +6931,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
if (ret) {
mlog_errno(ret);
need_free = 1;
goto out_commit;
goto out_unlock;
}
page_end = PAGE_CACHE_SIZE;
@ -6964,12 +6964,16 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
if (ret) {
mlog_errno(ret);
need_free = 1;
goto out_commit;
goto out_unlock;
}
inode->i_blocks = ocfs2_inode_sector_count(inode);
}
out_unlock:
if (pages)
ocfs2_unlock_and_free_pages(pages, num_pages);
out_commit:
if (ret < 0 && did_quota)
dquot_free_space_nodirty(inode,
@ -6989,15 +6993,11 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
ocfs2_commit_trans(osb, handle);
out_unlock:
out:
if (data_ac)
ocfs2_free_alloc_context(data_ac);
out:
if (pages) {
ocfs2_unlock_and_free_pages(pages, num_pages);
if (pages)
kfree(pages);
}
return ret;
}