Commit cda95406 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds

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: default avatarTejun Heo <tj@kernel.org>
Cc: Christine Caulfield <ccaulfie@redhat.com>
Cc: David Teigland <teigland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a15abcc9
...@@ -351,23 +351,20 @@ static struct dlm_rsb *recover_idr_find(struct dlm_ls *ls, uint64_t id) ...@@ -351,23 +351,20 @@ static struct dlm_rsb *recover_idr_find(struct dlm_ls *ls, uint64_t id)
return r; 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;
struct dlm_rsb *r = p; int id;
r->res_id = 0; spin_lock(&ls->ls_recover_idr_lock);
r->res_recover_locks_count = 0;
ls->ls_recover_list_count--;
dlm_put_rsb(r); idr_for_each_entry(&ls->ls_recover_idr, r, id) {
return 0; r->res_id = 0;
} r->res_recover_locks_count = 0;
ls->ls_recover_list_count--;
static void recover_idr_clear(struct dlm_ls *ls) dlm_put_rsb(r);
{ }
spin_lock(&ls->ls_recover_idr_lock);
idr_for_each(&ls->ls_recover_idr, recover_idr_clear_rsb, ls);
idr_remove_all(&ls->ls_recover_idr); idr_remove_all(&ls->ls_recover_idr);
if (ls->ls_recover_list_count != 0) { if (ls->ls_recover_list_count != 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment