The patch titled
Subject: ocfs2: unlock inode if deleting inode from orphan fails
has been removed from the -mm tree. Its filename was
ocfs2-unlock-inode-if-deleting-inode-from-orphan-fail.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Guozhonghua <guozhonghua@xxxxxxx>
Subject: 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@xxxxxxx>
Signed-off-by: Joseph Qi <joseph.qi@xxxxxxxxxx>
Reviewed-by: Gang He <ghe@xxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [4.2+]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/aops.c | 1 +
1 file changed, 1 insertion(+)
diff -puN fs/ocfs2/aops.c~ocfs2-unlock-inode-if-deleting-inode-from-orphan-fail fs/ocfs2/aops.c
--- a/fs/ocfs2/aops.c~ocfs2-unlock-inode-if-deleting-inode-from-orphan-fail
+++ a/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);
_
Patches currently in -mm which might be from guozhonghua@xxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
