From 03573168655dd4237c6d8a74a9d74b05358b26a2 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 27 Feb 2013 17:03:45 -0800 Subject: [PATCH] --- yaml --- r: 359314 b: refs/heads/master c: a67a380e6f8534b9fed3b3b663d108bf35af0132 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/dlm/lockspace.c | 1 - trunk/fs/dlm/recover.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d13eea893711..d8796afa2940 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cda95406c8fe491c01b3abc422c25a613e9f36ea +refs/heads/master: a67a380e6f8534b9fed3b3b663d108bf35af0132 diff --git a/trunk/fs/dlm/lockspace.c b/trunk/fs/dlm/lockspace.c index 2e99fb0c9737..3ca79d3253b9 100644 --- a/trunk/fs/dlm/lockspace.c +++ b/trunk/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/trunk/fs/dlm/recover.c b/trunk/fs/dlm/recover.c index b2856e701641..236d1085d6a2 100644 --- a/trunk/fs/dlm/recover.c +++ b/trunk/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",