From: David Teigland If recover_locks() on an rsb doesn't find any locks to recover, we need to clear the NEW_MASTER flag since it won't be cleared by dlm_recovered_lock(). Signed-off-by: David Teigland Signed-off-by: Andrew Morton --- drivers/dlm/recover.c | 4 ++++ 1 files changed, 4 insertions(+) diff -puN drivers/dlm/recover.c~dlm-recovery-clear-new_master-flag drivers/dlm/recover.c --- devel/drivers/dlm/recover.c~dlm-recovery-clear-new_master-flag 2005-07-16 13:35:48.000000000 -0700 +++ devel-akpm/drivers/dlm/recover.c 2005-07-16 13:35:48.000000000 -0700 @@ -472,6 +472,8 @@ static int recover_locks(struct dlm_rsb if (r->res_recover_locks_count) recover_list_add(r); + else + rsb_clear_flag(r, RSB_NEW_MASTER); out: unlock_rsb(r); return error; @@ -523,6 +525,8 @@ int dlm_recover_locks(struct dlm_ls *ls) void dlm_recovered_lock(struct dlm_rsb *r) { + DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_print_rsb(r);); + r->res_recover_locks_count--; if (!r->res_recover_locks_count) { clear_bit(RESFL_NEW_MASTER, &r->res_flags); _