diff options
| author | Ryan Ding <ryan.ding@oracle.com> | 2016-03-25 14:21:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 16:37:42 -0700 |
| commit | 28888681b4f641ce9a96478ce4683577cd3abbff (patch) | |
| tree | 48f10b475c7f9b9fc96957e88928f163ee6012f8 | |
| parent | ce170828e24959c69e7a40364731edc0535c550f (diff) | |
| download | linux-28888681b4f641ce9a96478ce4683577cd3abbff.tar.bz2 | |
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: Ryan Ding <ryan.ding@oracle.com>
Acked-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ocfs2/aops.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 328ac7f99d52..1581240a7ca0 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -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) { + mlog_errno(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); brelse(di_bh); out: - ocfs2_run_deallocs(osb, &dealloc); - if (locked) - mutex_unlock(&inode->i_mutex); - ocfs2_dio_free_write_ctx(inode, dwc); if (data_ac) ocfs2_free_alloc_context(data_ac); if (meta_ac) ocfs2_free_alloc_context(meta_ac); + ocfs2_run_deallocs(osb, &dealloc); + if (locked) + mutex_unlock(&inode->i_mutex); + ocfs2_dio_free_write_ctx(inode, dwc); } /* |