Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-beck.git] / lib / idr.c

diff --git a/lib/idr.c b/lib/idr.c
index ba7d37cf7847fbcd025b8039237acfef48c7a7ca..1cac726c44bc17cc6fa1a7b5ab6358279a0c9a5d 100644 (file)
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -140,7 +140,8 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
        id = *starting_id;
  restart:
        p = idp->top;
-       l = p->layer;
+       l = idp->layers;
+       pa[l--] = NULL;
        while (1) {
                /*
                 * 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;
                        id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
 
-                       /* did id go over the limit? */
-                       if (id >= (1 << (idp->layers * IDR_BITS))) {
+                       /* if already at the top layer, we need to grow */
+                       if (!(p = pa[l])) {
                                *starting_id = id;
                                return IDR_NEED_TO_GROW;
                        }