struct idr_layer *p;
spin_lock(&idp->lock);
- if ((p = idp->id_free)) {
- idp->id_free = p->ary[0];
- idp->id_free_cnt--;
- p->ary[0] = NULL;
+ if (!(p = idp->id_free)) {
+ spin_unlock(&idp->lock);
+ return NULL;
}
+ idp->id_free = p->ary[0];
+ idp->id_free_cnt--;
+ p->ary[0] = NULL;
spin_unlock(&idp->lock);
return(p);
}
}
EXPORT_SYMBOL(idr_get_new);
-static void idr_remove_warning(int id)
-{
- printk("idr_remove called for id=%d which is not allocated.\n", id);
- dump_stack();
-}
-
static void sub_remove(struct idr *idp, int shift, int id)
{
struct idr_layer *p = idp->top;
struct idr_layer **pa[MAX_LEVEL];
struct idr_layer ***paa = &pa[0];
- int n;
*paa = NULL;
*++paa = &idp->top;
while ((shift > 0) && p) {
- n = (id >> shift) & IDR_MASK;
+ int n = (id >> shift) & IDR_MASK;
__clear_bit(n, &p->bitmap);
*++paa = &p->ary[n];
p = p->ary[n];
shift -= IDR_BITS;
}
- n = id & IDR_MASK;
- if (likely(p != NULL && test_bit(n, &p->bitmap))){
+ if (likely(p != NULL)){
+ int n = id & IDR_MASK;
__clear_bit(n, &p->bitmap);
p->ary[n] = NULL;
while(*paa && ! --((**paa)->count)){
}
if ( ! *paa )
idp->layers = 0;
- } else {
- idr_remove_warning(id);
}
}