aboutsummaryrefslogtreecommitdiffstats
path: root/fs/super.c
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-10-04 20:13:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:04:56 -0400
commit125c4c706b680c7831f0966ff873c1ad0354ec25 (patch)
tree2b45c5fdd3f69173774fc9ae92c3568cb9796d37 /fs/super.c
parentb74ca3b3fd0fac08167ff96287cece56e8ca6f4d (diff)
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
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>
Diffstat (limited to 'fs/super.c')
-rw-r--r--fs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c
index 5fdf7ff32c4e..a3bc935069d9 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,7 @@ int get_anon_bdev(dev_t *p)
865 else if (error) 865 else if (error)
866 return -EAGAIN; 866 return -EAGAIN;
867 867
868 if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) { 868 if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {
869 spin_lock(&unnamed_dev_lock); 869 spin_lock(&unnamed_dev_lock);
870 ida_remove(&unnamed_dev_ida, dev); 870 ida_remove(&unnamed_dev_ida, dev);
871 if (unnamed_dev_start > dev) 871 if (unnamed_dev_start > dev)