dlm: don't use idr_remove_all()

idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. The conversion isn't completely trivial for recover_idr_clear() as it's the only place in kernel which makes legitimate use of idr_remove_all() w/o idr_destroy(). Replace it with idr_remove() call inside idr_for_each_entry() loop. It goes on top so that it matches the operation order in recover_idr_del(). Signed-off-by: Tejun Heo <[email protected]> Cc: Christine Caulfield <[email protected]> Cc: David Teigland <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
vbatts · Feb 28, 2013 · a67a380 · a67a380
1 parent cda9540
commit a67a380
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     	/*
@@ Expand Down @@