Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed496f4f authored by xuejiufei's avatar xuejiufei Committed by Sasha Levin
Browse files

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



[ 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: default avatarxuejiufei <xuejiufei@huawei.com>
Reviewed-by: default avatarJoseph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 80f93bfd

fs/ocfs2/dlm/dlmrecovery.c

+2 −0
Original line number Diff line number Diff line
@@ -2348,6 +2348,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;

			}