diff options
-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) | |||
796 | */ | 796 | */ |
797 | 797 | ||
798 | idr_for_each(&ls->ls_lkbidr, lkb_idr_free, ls); | 798 | idr_for_each(&ls->ls_lkbidr, lkb_idr_free, ls); |
799 | idr_remove_all(&ls->ls_lkbidr); | ||
800 | idr_destroy(&ls->ls_lkbidr); | 799 | idr_destroy(&ls->ls_lkbidr); |
801 | 800 | ||
802 | /* | 801 | /* |
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) | |||
359 | spin_lock(&ls->ls_recover_idr_lock); | 359 | spin_lock(&ls->ls_recover_idr_lock); |
360 | 360 | ||
361 | idr_for_each_entry(&ls->ls_recover_idr, r, id) { | 361 | idr_for_each_entry(&ls->ls_recover_idr, r, id) { |
362 | idr_remove(&ls->ls_recover_idr, id); | ||
362 | r->res_id = 0; | 363 | r->res_id = 0; |
363 | r->res_recover_locks_count = 0; | 364 | r->res_recover_locks_count = 0; |
364 | ls->ls_recover_list_count--; | 365 | ls->ls_recover_list_count--; |
365 | 366 | ||
366 | dlm_put_rsb(r); | 367 | dlm_put_rsb(r); |
367 | } | 368 | } |
368 | idr_remove_all(&ls->ls_recover_idr); | ||
369 | 369 | ||
370 | if (ls->ls_recover_list_count != 0) { | 370 | if (ls->ls_recover_list_count != 0) { |
371 | log_error(ls, "warning: recover_list_count %d", | 371 | log_error(ls, "warning: recover_list_count %d", |