diff options
| author | Kurt Hackel <Kurt.Hackel@oracle.com> | 2006-02-14 11:45:21 -0800 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-02-16 12:04:55 -0800 |
| commit | f671c09bce88ea253d576c842f8f39d9a2a29028 (patch) | |
| tree | af1ddeb0a068ca869c4a74f8eef88e1d6aa825bb /fs/ocfs2 | |
| parent | 745ae8ba29e729ec922393fa4d9448c385673599 (diff) | |
| download | blackbird-op-linux-f671c09bce88ea253d576c842f8f39d9a2a29028.tar.gz blackbird-op-linux-f671c09bce88ea253d576c842f8f39d9a2a29028.zip | |
[PATCH] ocfs2: detach from heartbeat events before freeing mle
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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index a3194fe173d9..2e2e95e69499 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -2482,7 +2482,9 @@ top: atomic_set(&mle->woken, 1); spin_unlock(&mle->spinlock); wake_up(&mle->wq); - /* final put will take care of list removal */ + /* do not need events any longer, so detach + * from heartbeat */ + __dlm_mle_detach_hb_events(dlm, mle); __dlm_put_mle(mle); } continue; @@ -2537,6 +2539,9 @@ top: spin_unlock(&res->spinlock); dlm_lockres_put(res); + /* about to get rid of mle, detach from heartbeat */ + __dlm_mle_detach_hb_events(dlm, mle); + /* dump the mle */ spin_lock(&dlm->master_lock); __dlm_put_mle(mle); |
