Merge ../linus

[mv-sheeva.git] / fs / dlm / recover.c

diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index 1a86dfc8034eb2e1daef7b0772458670dec3be50..cf9f6831bab57c34e9c733e4328a0c1a38ea534f 100644 (file)
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -252,6 +252,7 @@ static void recover_list_clear(struct dlm_ls *ls)
        spin_lock(&ls->ls_recover_list_lock);
        list_for_each_entry_safe(r, s, &ls->ls_recover_list, res_recover_list) {
                list_del_init(&r->res_recover_list);
+               r->res_recover_locks_count = 0;
                dlm_put_rsb(r);
                ls->ls_recover_list_count--;
        }
@@ -473,24 +474,13 @@ 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_print_rsb(r););
+       DLM_ASSERT(!r->res_recover_locks_count, dlm_dump_rsb(r););
 
        error = recover_locks_queue(r, &r->res_grantqueue);
        if (error)
@@ -557,7 +547,7 @@ 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););
+       DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_dump_rsb(r););
 
        r->res_recover_locks_count--;
        if (!r->res_recover_locks_count) {