summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorxuejiufei <xuejiufei@huawei.com>2016-02-05 15:36:47 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-17 12:30:56 -0800
commite6fe2687ef2727b687f31340da8edda25ed4e472 (patch)
tree9989864bb7a9a917860aab6b207601facf6176d9 /fs
parent7889b844ba4b9dc0b311b6daa6f6376a10fa9a75 (diff)
downloadblackbird-op-linux-e6fe2687ef2727b687f31340da8edda25ed4e472.tar.gz
blackbird-op-linux-e6fe2687ef2727b687f31340da8edda25ed4e472.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/dlm/dlmrecovery.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 9e4f862d20fe..42f0cae93a0a 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;
}
OpenPOWER on IntegriCloud