Skip to content

Commit

Permalink
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
Browse files Browse the repository at this point in the history 
To avoid name conflicts:

  drivers/video/riva/fbdev.c:281:9: sparse: preprocessor token MAX_LEVEL redefined

While at it, also make the other names more consistent and add
parentheses.

[akpm@linux-foundation.org: repair fallout]
[sfr@canb.auug.org.au: IB/mlx4: fix for MAX_ID_MASK to MAX_IDR_MASK name change]
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: walter harms <wharms@bfs.de>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Roland Dreier <roland@purestorage.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
@torvalds
Fengguang Wu authored and torvalds committed Oct 5, 2012
1 parent b74ca3b commit 125c4c7
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion drivers/i2c/i2c-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adap)

if (adap->nr == -1) /* -1 means dynamically assign bus id */
return i2c_add_adapter(adap);
if (adap->nr & ~MAX_ID_MASK)
if (adap->nr & ~MAX_IDR_MASK)
return -EINVAL;

retry:
Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/core/cm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
ret = idr_get_new_above(&cm.local_id_table, cm_id_priv,
next_id, &id);
if (!ret)
next_id = ((unsigned) id + 1) & MAX_ID_MASK;
next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
spin_unlock_irqrestore(&cm.lock, flags);
} while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );

Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/mlx4/cm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
ret = idr_get_new_above(&sriov->pv_id_table, ent,
next_id, &id);
if (!ret) {
next_id = ((unsigned) id + 1) & MAX_ID_MASK;
next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
ent->pv_cm_id = (u32)id;
sl_id_map_add(ibdev, ent);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/pps/pps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ int pps_register_cdev(struct pps_device *pps)
if (err < 0)
return err;

pps->id &= MAX_ID_MASK;
pps->id &= MAX_IDR_MASK;
if (pps->id >= PPS_MAX_SOURCES) {
pr_err("%s: too many PPS sources in the system\n",
pps->info.name);
Expand Down
2 changes: 1 addition & 1 deletion drivers/thermal/thermal_sys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static int get_idr(struct idr *idr, struct mutex *lock, int *id)
else if (unlikely(err))
return err;

*id = *id & MAX_ID_MASK;
*id = *id & MAX_IDR_MASK;
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion fs/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ int get_anon_bdev(dev_t *p)
else if (error)
return -EAGAIN;

if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {
spin_lock(&unnamed_dev_lock);
ida_remove(&unnamed_dev_ida, dev);
if (unnamed_dev_start > dev)
Expand Down
10 changes: 5 additions & 5 deletions include/linux/idr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
#define IDR_SIZE (1 << IDR_BITS)
#define IDR_MASK ((1 << IDR_BITS)-1)

#define MAX_ID_SHIFT (sizeof(int)*8 - 1)
#define MAX_ID_BIT (1U << MAX_ID_SHIFT)
#define MAX_ID_MASK (MAX_ID_BIT - 1)
#define MAX_IDR_SHIFT (sizeof(int)*8 - 1)
#define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
#define MAX_IDR_MASK (MAX_IDR_BIT - 1)

/* Leave the possibility of an incomplete final layer */
#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
#define MAX_IDR_LEVEL ((MAX_IDR_SHIFT + IDR_BITS - 1) / IDR_BITS)

/* Number of id_layer structs to leave in free list */
#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL
#define MAX_IDR_FREE (MAX_IDR_LEVEL * 2)

struct idr_layer {
unsigned long bitmap; /* A zero bit means "space here" */
Expand Down
32 changes: 16 additions & 16 deletions lib/idr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* that id to this code and it returns your pointer.
* You can release ids at any time. When all ids are released, most of
* the memory is returned (we keep IDR_FREE_MAX) in a local pool so we
* the memory is returned (we keep MAX_IDR_FREE) in a local pool so we
* don't need to go to the memory "store" during an id allocate, just
* so you don't need to be too concerned about locking and conflicts
* with the slab allocator.
Expand Down Expand Up @@ -122,7 +122,7 @@ static void idr_mark_full(struct idr_layer **pa, int id)
*/
int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
{
while (idp->id_free_cnt < IDR_FREE_MAX) {
while (idp->id_free_cnt < MAX_IDR_FREE) {
struct idr_layer *new;
new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
if (new == NULL)
Expand Down Expand Up @@ -179,7 +179,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
sh = IDR_BITS*l;
id = ((id >> sh) ^ n ^ m) << sh;
}
if ((id >= MAX_ID_BIT) || (id < 0))
if ((id >= MAX_IDR_BIT) || (id < 0))
return IDR_NOMORE_SPACE;
if (l == 0)
break;
Expand Down Expand Up @@ -223,7 +223,7 @@ static int idr_get_empty_slot(struct idr *idp, int starting_id,
* Add a new layer to the top of the tree if the requested
* id is larger than the currently allocated space.
*/
while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
while ((layers < (MAX_IDR_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
layers++;
if (!p->count) {
/* special case: if the tree is currently empty,
Expand Down Expand Up @@ -265,7 +265,7 @@ static int idr_get_empty_slot(struct idr *idp, int starting_id,

static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
{
struct idr_layer *pa[MAX_LEVEL];
struct idr_layer *pa[MAX_IDR_LEVEL];
int id;

id = idr_get_empty_slot(idp, starting_id, pa);
Expand Down Expand Up @@ -357,7 +357,7 @@ static void idr_remove_warning(int id)
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 **pa[MAX_IDR_LEVEL];
struct idr_layer ***paa = &pa[0];
struct idr_layer *to_free;
int n;
Expand Down Expand Up @@ -402,7 +402,7 @@ void idr_remove(struct idr *idp, int id)
struct idr_layer *to_free;

/* Mask off upper bits we don't use for the search. */
id &= MAX_ID_MASK;
id &= MAX_IDR_MASK;

sub_remove(idp, (idp->layers - 1) * IDR_BITS, id);
if (idp->top && idp->top->count == 1 && (idp->layers > 1) &&
Expand All @@ -420,7 +420,7 @@ void idr_remove(struct idr *idp, int id)
to_free->bitmap = to_free->count = 0;
free_layer(to_free);
}
while (idp->id_free_cnt >= IDR_FREE_MAX) {
while (idp->id_free_cnt >= MAX_IDR_FREE) {
p = get_from_free_list(idp);
/*
* Note: we don't call the rcu callback here, since the only
Expand Down Expand Up @@ -451,7 +451,7 @@ void idr_remove_all(struct idr *idp)
int n, id, max;
int bt_mask;
struct idr_layer *p;
struct idr_layer *pa[MAX_LEVEL];
struct idr_layer *pa[MAX_IDR_LEVEL];
struct idr_layer **paa = &pa[0];

n = idp->layers * IDR_BITS;
Expand Down Expand Up @@ -517,7 +517,7 @@ void *idr_find(struct idr *idp, int id)
n = (p->layer+1) * IDR_BITS;

/* Mask off upper bits we don't use for the search. */
id &= MAX_ID_MASK;
id &= MAX_IDR_MASK;

if (id >= (1 << n))
return NULL;
Expand Down Expand Up @@ -555,7 +555,7 @@ int idr_for_each(struct idr *idp,
{
int n, id, max, error = 0;
struct idr_layer *p;
struct idr_layer *pa[MAX_LEVEL];
struct idr_layer *pa[MAX_IDR_LEVEL];
struct idr_layer **paa = &pa[0];

n = idp->layers * IDR_BITS;
Expand Down Expand Up @@ -601,7 +601,7 @@ EXPORT_SYMBOL(idr_for_each);
*/
void *idr_get_next(struct idr *idp, int *nextidp)
{
struct idr_layer *p, *pa[MAX_LEVEL];
struct idr_layer *p, *pa[MAX_IDR_LEVEL];
struct idr_layer **paa = &pa[0];
int id = *nextidp;
int n, max;
Expand Down Expand Up @@ -659,7 +659,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id)

n = (p->layer+1) * IDR_BITS;

id &= MAX_ID_MASK;
id &= MAX_IDR_MASK;

if (id >= (1 << n))
return ERR_PTR(-EINVAL);
Expand Down Expand Up @@ -780,7 +780,7 @@ EXPORT_SYMBOL(ida_pre_get);
*/
int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
{
struct idr_layer *pa[MAX_LEVEL];
struct idr_layer *pa[MAX_IDR_LEVEL];
struct ida_bitmap *bitmap;
unsigned long flags;
int idr_id = starting_id / IDA_BITMAP_BITS;
Expand All @@ -793,7 +793,7 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
if (t < 0)
return _idr_rc_to_errno(t);

if (t * IDA_BITMAP_BITS >= MAX_ID_BIT)
if (t * IDA_BITMAP_BITS >= MAX_IDR_BIT)
return -ENOSPC;

if (t != idr_id)
Expand Down Expand Up @@ -827,7 +827,7 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
}

id = idr_id * IDA_BITMAP_BITS + t;
if (id >= MAX_ID_BIT)
if (id >= MAX_IDR_BIT)
return -ENOSPC;

__set_bit(t, bitmap->bitmap);
Expand Down

0 comments on commit 125c4c7

Please sign in to comment.