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 /block/genhd.c | |
| parent | f4fa27c16ba9b6910c5b815e5c13a7e8249277f0 (diff) | |
| download | lwn-b446b60e4eb5e5457120c4728ada871b1209c1d0.tar.gz lwn-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>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 9 |
1 files changed, 2 insertions, 7 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; |