---

yaml --- r: 38797 b: refs/heads/master c: 233e515 h: refs/heads/master i: 38795: 632e8c7 v: v3
git-mirror · Aug 24, 2006 · 313308e · 313308e
1 parent 700a2ea
commit 313308e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git 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
@@ -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););