aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/dlm/recover.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index 528a2a0fa329..a5e6d184872e 100644
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -473,22 +473,11 @@ static int recover_locks_queue(struct dlm_rsb *r, struct list_head *head)
473 return error; 473 return error;
474} 474}
475 475
476static int all_queues_empty(struct dlm_rsb *r)
477{
478 if (!list_empty(&r->res_grantqueue) ||
479 !list_empty(&r->res_convertqueue) ||
480 !list_empty(&r->res_waitqueue))
481 return 0;
482 return 1;
483}
484
485static int recover_locks(struct dlm_rsb *r) 476static int recover_locks(struct dlm_rsb *r)
486{ 477{
487 int error = 0; 478 int error = 0;
488 479
489 lock_rsb(r); 480 lock_rsb(r);
490 if (all_queues_empty(r))
491 goto out;
492 481
493 DLM_ASSERT(!r->res_recover_locks_count, dlm_dump_rsb(r);); 482 DLM_ASSERT(!r->res_recover_locks_count, dlm_dump_rsb(r););
494 483