diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-24 08:24:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-24 08:24:26 +0100 |
| commit | fc5b9d12745e9df300f899d9911e6130976e32f6 (patch) | |
| tree | 82e82aec17f53b2acff8e736a393f3aa346ce180 /lib | |
| parent | 4e8068c2c67e201044e9587407acc2fd7971ece8 (diff) | |
| parent | 75ef7cdda2daa35be9e070ac8e5258759ac03d06 (diff) | |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/idr.c b/lib/idr.c index 1cac726c44bc..0dc782216d4b 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -156,10 +156,12 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa) id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; /* if already at the top layer, we need to grow */ - if (!(p = pa[l])) { + if (id >= 1 << (idp->layers * IDR_BITS)) { *starting_id = id; return IDR_NEED_TO_GROW; } + p = pa[l]; + BUG_ON(!p); /* If we need to go up one layer, continue the * loop; otherwise, restart from the top. |