return error;
}
-static int all_queues_empty(struct dlm_rsb *r)
-{
- if (!list_empty(&r->res_grantqueue) ||
- !list_empty(&r->res_convertqueue) ||
- !list_empty(&r->res_waitqueue))
- return 0;
- return 1;
-}
-
static int recover_locks(struct dlm_rsb *r)
{
int error = 0;
lock_rsb(r);
- if (all_queues_empty(r))
- goto out;
- DLM_ASSERT(!r->res_recover_locks_count, dlm_print_rsb(r););
+ DLM_ASSERT(!r->res_recover_locks_count, dlm_dump_rsb(r););
error = recover_locks_queue(r, &r->res_grantqueue);
if (error)
void dlm_recovered_lock(struct dlm_rsb *r)
{
- DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_print_rsb(r););
+ DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_dump_rsb(r););
r->res_recover_locks_count--;
if (!r->res_recover_locks_count) {