Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359314
b: refs/heads/master
c: a67a380
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Linus Torvalds committed Feb 28, 2013
1 parent ef4652c commit 0357316
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cda95406c8fe491c01b3abc422c25a613e9f36ea
refs/heads/master: a67a380e6f8534b9fed3b3b663d108bf35af0132
1 change: 0 additions & 1 deletion trunk/fs/dlm/lockspace.c
Original file line number Diff 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
2 changes: 1 addition & 1 deletion trunk/fs/dlm/recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 0357316

Please sign in to comment.