Skip to contentSkip to conversation

Patch "ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Feb 12, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ocfs2-dlm-clear-refmap-bit-of-recovery-lock-while-doing-local-recovery-cleanup.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c95a51807b730e4681e2ecbdfd669ca52601959e Mon Sep 17 00:00:00 2001

From: xuejiufei <[email protected]>
Date: Fri, 5 Feb 2016 15:36:47 -0800
Subject: ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup

From: xuejiufei <[email protected]>

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.

---
 fs/ocfs2/dlm/dlmrecovery.c |    2 ++
 1 file changed, 2 insertions(+)
fs/ocfs2/dlm/dlmrecovery.c +2 -0
@@ -2360,6 +2360,8 @@ static void dlm_do_local_recovery_cleanu
 						break;
 					}
 				}
+				dlm_lockres_clear_refmap_bit(dlm, res,
+						dead_node);
 				spin_unlock(&res->spinlock);
 				continue;
 			}

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/ocfs2-dlm-ignore-cleaning-the-migration-mle-that-is-inuse.patch queue-4.4/ocfs2-dlm-clear-refmap-bit-of-recovery-lock-while-doing-local-recovery-cleanup.patch