Commit 28888681 authored by Ryan Ding's avatar Ryan Ding Committed by Linus Torvalds
Browse files

ocfs2: fix a deadlock issue in ocfs2_dio_end_io_write()

The code should call ocfs2_free_alloc_context() to free meta_ac &
data_ac before calling ocfs2_run_deallocs().  Because
ocfs2_run_deallocs() will acquire the system inode's i_mutex hold by
meta_ac.  So try to release the lock before ocfs2_run_deallocs().

Fixes: af1310367f41 ("ocfs2: fix sparse file & data ordering issue in direct io.")
Signed-off-by: default avatarRyan Ding <>
Acked-by: default avatarJunxiao Bi <>
Cc: Joseph Qi <>
Cc: Mark Fasheh <>
Cc: Joel Becker <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent ce170828
......@@ -2341,6 +2341,10 @@ static void ocfs2_dio_end_io_write(struct inode *inode,
ret = ocfs2_lock_allocators(inode, &et, 0, dwc->dw_zero_count*2,
&data_ac, &meta_ac);
if (ret) {
goto unlock;
credits = ocfs2_calc_extend_credits(inode->i_sb, &di->id2.i_list);
......@@ -2380,14 +2384,14 @@ unlock:
ocfs2_inode_unlock(inode, 1);
ocfs2_run_deallocs(osb, &dealloc);
if (locked)
ocfs2_dio_free_write_ctx(inode, dwc);
if (data_ac)
if (meta_ac)
ocfs2_run_deallocs(osb, &dealloc);
if (locked)
ocfs2_dio_free_write_ctx(inode, dwc);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment