From: xuejiufei <xuejiufei@huawei.com>
Date: Fri, 5 Feb 2016 23:36:47 +0000 (-0800)
Subject: ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup
X-Git-Tag: v4.1.12-92~150^2~235
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2bde9a4df028b450fc41ba7d710f6ad966d06cb0;p=users%2Fjedix%2Flinux-maple.git

ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup

Orabug: stable_rc4

[ Upstream commit c95a51807b730e4681e2ecbdfd669ca52601959e ]

When recovery master down, dlm_do_local_recovery_cleanup() only remove
the $RECOVERY lock owned by dead node, but do not clear the refmap bit.
Which will make umount thread falling in dead loop migrating $RECOVERY
to the dead node.

Signed-off-by: xuejiufei <xuejiufei@huawei.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit ff5ecd2953a635bf70101dac550fcb01ced863e9)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 3d90ad7ff91fe..f25ff5d3a2f99 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -2360,6 +2360,8 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node)
 						break;
 					}
 				}
+				dlm_lockres_clear_refmap_bit(dlm, res,
+						dead_node);
 				spin_unlock(&res->spinlock);
 				continue;
 			}