aboutsummaryrefslogtreecommitdiffstats
path: root/block/genhd.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-02-20 16:57:48 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 20:10:13 -0500
commitb446b60e4eb5e5457120c4728ada871b1209c1d0 (patch)
tree1fcff840a5cfb61399b9eac843d5b74e9e6b45e0 /block/genhd.c
parentf4fa27c16ba9b6910c5b815e5c13a7e8249277f0 (diff)
[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.c9
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 @@
5#include <linux/module.h> 5#include <linux/module.h>
6#include <linux/fs.h> 6#include <linux/fs.h>
7#include <linux/genhd.h> 7#include <linux/genhd.h>
8#include <linux/kdev_t.h>
8#include <linux/kernel.h> 9#include <linux/kernel.h>
9#include <linux/blkdev.h> 10#include <linux/blkdev.h>
10#include <linux/init.h> 11#include <linux/init.h>
@@ -61,13 +62,7 @@ int register_blkdev(unsigned int major, const char *name)
61 /* temporary */ 62 /* temporary */
62 if (major == 0) { 63 if (major == 0) {
63 for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) { 64 for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) {
64 /* 65 if (is_lanana_major(index))
65 * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
66 * majors
67 */
68 if ((60 <= index && index <= 63) ||
69 (120 <= index && index <= 127) ||
70 (240 <= index && index <= 254))
71 continue; 66 continue;
72 if (major_names[index] == NULL) 67 if (major_names[index] == NULL)
73 break; 68 break;