diff --git a/[refs] b/[refs] index b1228fee3b58..1b8bd55ee0a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5888750aad219bec42f3f28354eb230d1a47b89 +refs/heads/master: 233e515f4062f99569c24f00ad7429a860b23db4 diff --git a/trunk/fs/dlm/recover.c b/trunk/fs/dlm/recover.c index 528a2a0fa329..a5e6d184872e 100644 --- a/trunk/fs/dlm/recover.c +++ b/trunk/fs/dlm/recover.c @@ -473,22 +473,11 @@ static int recover_locks_queue(struct dlm_rsb *r, struct list_head *head) 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_dump_rsb(r););