diff options
| author | David Teigland <teigland@redhat.com> | 2006-11-02 09:49:02 -0600 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-30 10:35:03 -0500 |
| commit | 520698096436f7da5b9142e63e3bed5580c5f14e (patch) | |
| tree | 242196abb5c420855308709db8299e141e2381ac | |
| parent | fdda387f73947e6ae511ec601f5b3c6fbb582aac (diff) | |
| download | linux-520698096436f7da5b9142e63e3bed5580c5f14e.tar.bz2 | |
[DLM] res_recover_locks_count not reset when recover_locks is aborted
Red Hat BZ 213684
If a node sends an lkb to the new master (RCOM_LOCK message) during
recovery and recovery is then aborted on both nodes before it gets a
reply, the res_recover_locks_count needs to be reset to 0 so that when the
subsequent recovery comes along and sends the lkb to the new master again
the assertion doesn't trigger that checks that counter is zero.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| -rw-r--r-- | fs/dlm/recover.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c index a5e6d184872e..cf9f6831bab5 100644 --- a/fs/dlm/recover.c +++ b/fs/dlm/recover.c @@ -252,6 +252,7 @@ static void recover_list_clear(struct dlm_ls *ls) spin_lock(&ls->ls_recover_list_lock); list_for_each_entry_safe(r, s, &ls->ls_recover_list, res_recover_list) { list_del_init(&r->res_recover_list); + r->res_recover_locks_count = 0; dlm_put_rsb(r); ls->ls_recover_list_count--; } |