From: David Teigland Date: Thu, 2 Nov 2006 15:49:02 +0000 (-0600) Subject: [DLM] res_recover_locks_count not reset when recover_locks is aborted X-Git-Tag: v2.6.20-rc1~145^2^2~5^2~34 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=520698096436f7da5b9142e63e3bed5580c5f14e;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Steven Whitehouse --- diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c index a5e6d184872..cf9f6831bab 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--; }