diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lockspace.c | 1 | ||||
| -rw-r--r-- | fs/dlm/recover.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 2e99fb0c9737..3ca79d3253b9 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -796,7 +796,6 @@ static int release_lockspace(struct dlm_ls *ls, int force) */ idr_for_each(&ls->ls_lkbidr, lkb_idr_free, ls); - idr_remove_all(&ls->ls_lkbidr); idr_destroy(&ls->ls_lkbidr); /* diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c index b2856e701641..236d1085d6a2 100644 --- a/fs/dlm/recover.c +++ b/fs/dlm/recover.c @@ -359,13 +359,13 @@ static void recover_idr_clear(struct dlm_ls *ls) spin_lock(&ls->ls_recover_idr_lock); idr_for_each_entry(&ls->ls_recover_idr, r, id) { + idr_remove(&ls->ls_recover_idr, 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) { log_error(ls, "warning: recover_list_count %d", |