1 files changed, 10 insertions, 13 deletions

diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index aedea28a86a1..b2856e701641 100644
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -351,23 +351,20 @@ static struct dlm_rsb *recover_idr_find(struct dlm_ls *ls, uint64_t id)
         return r;
 }
 
-static int recover_idr_clear_rsb(int id, void *p, void *data)
+static void recover_idr_clear(struct dlm_ls *ls)
 {
-        struct dlm_ls *ls = data;
-        struct dlm_rsb *r = p;
+        struct dlm_rsb *r;
+        int id;
 
-        r->res_id = 0;
-        r->res_recover_locks_count = 0;
-        ls->ls_recover_list_count--;
+        spin_lock(&ls->ls_recover_idr_lock);
 
-        dlm_put_rsb(r);
-        return 0;
-}
+        idr_for_each_entry(&ls->ls_recover_idr, r, id) {
+                r->res_id = 0;
+                r->res_recover_locks_count = 0;
+                ls->ls_recover_list_count--;
 
-static void recover_idr_clear(struct dlm_ls *ls)
-{
-        spin_lock(&ls->ls_recover_idr_lock);
-        idr_for_each(&ls->ls_recover_idr, recover_idr_clear_rsb, ls);
+                dlm_put_rsb(r);
+        }
         idr_remove_all(&ls->ls_recover_idr);
 
         if (ls->ls_recover_list_count != 0) {