diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-02-20 13:57:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 17:10:13 -0800 |
| commit | b446b60e4eb5e5457120c4728ada871b1209c1d0 (patch) | |
| tree | 1fcff840a5cfb61399b9eac843d5b74e9e6b45e0 | |
| parent | f4fa27c16ba9b6910c5b815e5c13a7e8249277f0 (diff) | |
| download | linux-b446b60e4eb5e5457120c4728ada871b1209c1d0.tar.gz linux-b446b60e4eb5e5457120c4728ada871b1209c1d0.tar.bz2 linux-b446b60e4eb5e5457120c4728ada871b1209c1d0.zip | |
[PATCH] rework reserved major handling
Several people have reported failures in dynamic major device number handling
due to the recent changes in there to avoid handing out the local/experimental
majors.
Rolf reports that this is due to a gcc-4.1.0 bug.
The patch refactors that code a lot in an attempt to provoke the compiler into
behaving.
Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | block/genhd.c | 9 | ||||
| -rw-r--r-- | drivers/base/core.c | 14 | ||||
| -rw-r--r-- | fs/char_dev.c | 8 | ||||
| -rw-r--r-- | include/linux/kdev_t.h | 1 |
4 files changed, 19 insertions, 13 deletions
diff --git a/block/genhd.c b/block/genhd.c index 36bd3e12a6d4..050a1f0f3a86 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -5,6 +5,7 @@ #include <linux/module.h> #include <linux/fs.h> #include <linux/genhd.h> +#include <linux/kdev_t.h> #include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/init.h> @@ -61,13 +62,7 @@ int register_blkdev(unsigned int major, const char *name) /* temporary */ if (major == 0) { for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) { - /* - * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL - * majors - */ - if ((60 <= index && index <= 63) || - (120 <= index && index <= 127) || - (240 <= index && index <= 254)) + if (is_lanana_major(index)) continue; if (major_names[index] == NULL) break; diff --git a/drivers/base/core.c b/drivers/base/core.c index a8ac34ba6107..d04fd33dcd91 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -28,6 +28,20 @@ int (*platform_notify)(struct device * dev) = NULL; int (*platform_notify_remove)(struct device * dev) = NULL; /* + * Detect the LANANA-assigned LOCAL/EXPERIMENTAL majors + */ +bool is_lanana_major(unsigned int major) +{ + if (major >= 60 && major <= 63) + return 1; + if (major >= 120 && major <= 127) + return 1; + if (major >= 240 && major <= 254) + return 1; + return 0; +} + +/* * sysfs bindings for devices. */ diff --git a/fs/char_dev.c b/fs/char_dev.c index e6194e2b9bb9..78ced721554d 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -6,6 +6,7 @@ #include <linux/init.h> #include <linux/fs.h> +#include <linux/kdev_t.h> #include <linux/slab.h> #include <linux/string.h> @@ -108,12 +109,7 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor, /* temporary */ if (major == 0) { for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) { - /* - * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL - * majors - */ - if ((60 <= i && i <= 63) || (120 <= i && i <= 127) || - (240 <= i && i <= 254)) + if (is_lanana_major(i)) continue; if (chrdevs[i] == NULL) break; diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h index bceea527dd37..4c2c3737e415 100644 --- a/include/linux/kdev_t.h +++ b/include/linux/kdev_t.h @@ -87,6 +87,7 @@ static inline unsigned sysv_minor(u32 dev) return dev & 0x3ffff; } +bool is_lanana_major(unsigned int major); #else /* __KERNEL__ */ |