From cda95406c8fe491c01b3abc422c25a613e9f36ea Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 27 Feb 2013 17:03:44 -0800 Subject: [PATCH] dlm: use idr_for_each_entry() in recover_idr_clear() error path Convert recover_idr_clear() to use idr_for_each_entry() instead of idr_for_each(). It's somewhat less efficient this way but it shouldn't matter in an error path. This is to help with deprecation of idr_remove_all(). Signed-off-by: Tejun Heo Cc: Christine Caulfield Cc: David Teigland Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/dlm/recover.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 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) -{ - struct dlm_ls *ls = data; - struct dlm_rsb *r = p; - - r->res_id = 0; - r->res_recover_locks_count = 0; - ls->ls_recover_list_count--; - - dlm_put_rsb(r); - return 0; -} - static void recover_idr_clear(struct dlm_ls *ls) { + struct dlm_rsb *r; + int id; + spin_lock(&ls->ls_recover_idr_lock); - idr_for_each(&ls->ls_recover_idr, recover_idr_clear_rsb, ls); + + 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--; + + dlm_put_rsb(r); + } idr_remove_all(&ls->ls_recover_idr); if (ls->ls_recover_list_count != 0) {