Commit 52069809 authored Nov 02, 2006 by David Teigland Committed by Steven Whitehouse Nov 30, 2006

[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>

parent fdda387f

fs/dlm/recover.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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--;
		}