[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>

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;