diff options
| author | xuejiufei <xuejiufei@huawei.com> | 2016-02-05 15:36:47 -0800 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-03-12 14:25:43 +0100 |
| commit | 64da7b6527f3e80f65a0ce1b47fb0cd1d66a1853 (patch) | |
| tree | ee5f92f50ca6d1c9e8bf525222f08754b50c26fb | |
| parent | fb7c25179e6a120abb7cab2238fd3a1dc7744cd9 (diff) | |
| download | lwn-64da7b6527f3e80f65a0ce1b47fb0cd1d66a1853.tar.gz lwn-64da7b6527f3e80f65a0ce1b47fb0cd1d66a1853.zip | |
ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup
commit c95a51807b730e4681e2ecbdfd669ca52601959e upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[wt: dlm_lockres_clear_refmap_bit() takes 2 args in 2.6.32]
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index 3492550b70c8..d69325416c4f 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c @@ -2260,6 +2260,7 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) break; } } + dlm_lockres_clear_refmap_bit(dead_node, res); spin_unlock(&res->spinlock); continue; } |