idr-rename-max_level-to-max_idr_level-fix

repair fallout

Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: walter harms <wharms@bfs.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index bfa92a3cc2586aa8d4d144fe10cce3581d4dad31..a7edf987a339f7e1708faa290d4a030c5d7de939 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -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:

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index d67999f6e34a147a6f99cdcd162fba4ebfdbb82d..394fea2ba1bc2018cac2f047ee7f0802823b0222 100644 (file)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -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) );
 

diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index e771487132f7542123a0e8a669cd8582481ab051..2420d5af05839a8403bf6b0bd00fe07ad9c5ae42 100644 (file)
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -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);

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index d5455095edae6395ce1cdb968c049cacc23bf353..a69f24c4414af31b976d131e14ead3448628e084 100644 (file)
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -148,7 +148,7 @@ again:
        else if (unlikely(err))
                return err;
 
-       *id = *id & MAX_ID_MASK;
+       *id = *id & MAX_IDR_MASK;
        return 0;
 }
 

diff --git a/fs/super.c b/fs/super.c
index 5fdf7ff32c4e283e74373bbabe00f9e165d5aa41..a3bc935069d9d5c643657793602ea42201263ed4 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -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)