diff options
| author |  Guozhonghua <guozhonghua@h3c.com>
| 2016-02-26 15:19:40 -0800 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@linux-foundation.org>
| 2016-02-27 10:28:52 -0800 |
| commit | a4a8481ff68a8a324a878e281bc37f18665224f7 (patch) | |
| tree | 0a7465c913bb96534a4a2ab5d3ac4c6587f86e56 /fs/ocfs2 | |
| parent | mm: ASLR: use get_random_long() (diff) | |
| download | linux-a4a8481ff68a8a324a878e281bc37f18665224f7.tar.gz linux-a4a8481ff68a8a324a878e281bc37f18665224f7.tar.bz2 linux-a4a8481ff68a8a324a878e281bc37f18665224f7.zip | |
ocfs2: unlock inode if deleting inode from orphan fails
When doing append direct io cleanup, if deleting inode fails, it goes
out without unlocking inode, which will cause the inode deadlock.
This issue was introduced by commit cf1776a9e834 ("ocfs2: fix a tiny
race when truncate dio orohaned entry").
Signed-off-by: Guozhonghua <guozhonghua@h3c.com>
Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Reviewed-by: Gang He <ghe@suse.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: <stable@vger.kernel.org> [4.2+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/aops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 794fd1587f34..cda0361e95a4 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -956,6 +956,7 @@ clean_orphan: tmp_ret = ocfs2_del_inode_from_orphan(osb, inode, di_bh, update_isize, end); if (tmp_ret < 0) { + ocfs2_inode_unlock(inode, 1); ret = tmp_ret; mlog_errno(ret); brelse(di_bh); |