[PATCH] remove protection of LANANA-reserved majors

Revert all this.  It can cause device-mapper to receive a different major from
earlier kernels and it turns out that the Amanda backup program (via GNU tar,
apparently) checks major numbers on files when performing incremental backups.

Which is a bit broken of Amanda (or tar), but this feature isn't important
enough to justify the churn.

Cc: Ingo Molnar <mingo@elte.hu>
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 050a1f0f3a8633ff90f8f89355e3b562f070ce7f..441432a142f231b871750caa5fed9a82c0cd750a 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -62,8 +62,6 @@ int register_blkdev(unsigned int major, const char *name)
        /* temporary */
        if (major == 0) {
                for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) {
-                       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 ad0f4a2f25c466079c6c471f8b0f77a83b2845f0..d7fcf823a42a71e08af9da4e62d83b0dae5129fd 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -27,20 +27,6 @@
 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 78ced721554d8f855f3254ac052e15d8b248d47d..164a45cdaf5f96cd8e6ac92b617c0525f0aaf8ff 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -109,8 +109,6 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
        /* temporary */
        if (major == 0) {
                for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
-                       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 4c2c3737e415e26115ea02658fd87bb9cfed2e08..2dacab8beccb9753aa8d3c6b0307636eece13758 100644 (file)
--- a/include/linux/kdev_t.h
+++ b/include/linux/kdev_t.h
@@ -87,8 +87,6 @@ static inline unsigned sysv_minor(u32 dev)
        return dev & 0x3ffff;
 }
 
-bool is_lanana_major(unsigned int major);
-
 #else /* __KERNEL__ */
 
 /*