aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2006-04-27 21:53:04 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2006-06-26 17:42:52 -0400
commitda01ad05528bf6f6bcb286329b14225a71713325 (patch)
tree0a3cf2161c9880cd6e6ffadf105878f0441bc35c /fs/ocfs2
parenta2bf04774bf4aa0a75036c1e92e3d2fd1cce2aff (diff)
ocfs2: detach mle from heartbeat events
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 19399446aa8e..d7a51691e7d3 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2673,6 +2673,7 @@ static int dlm_add_migration_mle(struct dlm_ctxt *dlm,
2673 /* remove it from the list so that only one 2673 /* remove it from the list so that only one
2674 * mle will be found */ 2674 * mle will be found */
2675 list_del_init(&tmp->list); 2675 list_del_init(&tmp->list);
2676 __dlm_mle_detach_hb_events(dlm, mle);
2676 } 2677 }
2677 spin_unlock(&tmp->spinlock); 2678 spin_unlock(&tmp->spinlock);
2678 } 2679 }
@@ -2767,6 +2768,7 @@ top:
2767 2768
2768 /* remove from the list early. NOTE: unlinking 2769 /* remove from the list early. NOTE: unlinking
2769 * list_head while in list_for_each_safe */ 2770 * list_head while in list_for_each_safe */
2771 __dlm_mle_detach_hb_events(dlm, mle);
2770 spin_lock(&mle->spinlock); 2772 spin_lock(&mle->spinlock);
2771 list_del_init(&mle->list); 2773 list_del_init(&mle->list);
2772 atomic_set(&mle->woken, 1); 2774 atomic_set(&mle->woken, 1);