lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

idr: revert misallocation bug fix

Browse Source 
Commit 859ddf0974 tried to fix
misallocation bug but broke full bit marking by not clearing
pa[idp->layers] and also is causing X failures due to lookup failure
in drm code.  The cause of the latter hasn't been found yet.  Revert
the fix for now.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tejun Heo
2010-02-04 17:57:37 +09:00
committed by Linus Torvalds
parent e9e70bc14e
commit 6f14a668f1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/idr.c
View File

@@ -140,7 +140,8 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
id = *starting_id; id = *starting_id;
restart: restart:
p = idp->top; p = idp->top;
l = p->layer; l = idp->layers;
pa[l--] = NULL;
while (1) { while (1) {
/* /*
* We run around this while until we reach the leaf node... * We run around this while until we reach the leaf node...
@@ -154,8 +155,8 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
oid = id; oid = id;
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
/* did id go over the limit? */ /* if already at the top layer, we need to grow */
if (id >= (1 << (idp->layers * IDR_BITS))) { if (!(p = pa[l])) {
*starting_id = id; *starting_id = id;
return IDR_NEED_TO_GROW; return IDR_NEED_TO_GROW;
} }