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

diff --git a/block/genhd.c b/block/genhd.c
index 36bd3e12a6d4c58bdda0dde62237a50d84b93d09..050a1f0f3a8633ff90f8f89355e3b562f070ce7f 100644 (file)
--- 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 a8ac34ba610716a4fc5c4193920a3d44a4697ccd..d04fd33dcd91526775606ce37ae1806b3d7be380 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -27,6 +27,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 e6194e2b9bb9cbf39c9c85f23d346d55716293a1..78ced721554d8f855f3254ac052e15d8b248d47d 100644 (file)
--- 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 bceea527dd37ffe02af7821d4cec50653dc7eac5..4c2c3737e415e26115ea02658fd87bb9cfed2e08 100644 (file)
--- 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__ */