[PATCH] MODULE_ALIAS() in block devices

From: Rusty Russell <rusty@rustcorp.com.au>

Previously, default aliases were hardwired into modutils.  Now they should
be inside the modules, using MODULE_ALIAS() (they will be overridden by any
user alias).

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 10566621eb81a9cc3e5111d12464aebc5517dc0b..b25acb42542ea0e9df3ddd430f34a5cd397324de 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4607,3 +4607,5 @@ MODULE_LICENSE("GPL");
 __setup ("floppy=", floppy_setup);
 module_init(floppy_init)
 #endif
+
+MODULE_ALIAS_BLOCKDEV_MAJOR(FLOPPY_MAJOR);

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 8b4972feca7123a0858950e155db82743f6d42c4..dc06ce7adfa6b37429e8441ad54055a06710ee9d 100644 (file)
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -1103,5 +1103,5 @@ __setup ("xd_geo=", xd_manual_geo_init);
 
 #endif /* MODULE */
 
-module_init(xd_init)
-
+module_init(xd_init);
+MODULE_ALIAS_BLOCKDEV_MAJOR(XT_DISK_MAJOR);

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index 969945a7bdb44e58700b5c4493254cc2da60ce0c..8503b193aea553836d81664a1e6493f51679bb58 100644 (file)
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -2499,3 +2499,4 @@ static int azt_bcd2bin(unsigned char bcd)
 }
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(AZTECH_CDROM_MAJOR);

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 379b454684dd8ca685e0fd0bb3a537b0e1ad44fc..5a30990de102b5b9af5aa3d69e81581402bf342d 100644 (file)
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -3500,3 +3500,4 @@ module_init(cdu31a_init);
 module_exit(cdu31a_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(CDU31A_CDROM_MAJOR);

diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 22464a5fd19a0ca20f4247012ee673071e247d22..c462db3b81ce015df53ac73532ffe04ddb1bcc3d 100644 (file)
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1616,7 +1616,7 @@ static int __init cm206_setup(char *s)
 __setup("cm206=", cm206_setup);
 
 #endif                         /* !MODULE */
-
+MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR);
 
 /*
  * Local variables:

diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index b24979c1104b6b723b7209512c54fae8181f9920..111f020de66e2ee7511de785d7ed63890c9e4597 100644 (file)
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -1029,3 +1029,4 @@ MODULE_AUTHOR("Oliver Raupach <raupach@nwfs1.rz.fh-hannover.de>");
 MODULE_LICENSE("GPL");
 module_init(gscd_init);
 module_exit(gscd_exit);
+MODULE_ALIAS_BLOCKDEV_MAJOR(GOLDSTAR_CDROM_MAJOR);

diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index e17822236df46f2d9930f407d915322aa3025550..33b35e30e619a0f61373eafead9336ae2dcd156f 100644 (file)
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -1559,3 +1559,4 @@ module_exit(mcd_exit);
 
 MODULE_AUTHOR("Martin Harriss");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(MITSUMI_CDROM_MAJOR);

diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 70719df8305d48665d3a43307bef700c8a37dcc1..ba4700ddbb0f610fbe7c97697d5954bc96ed5ad4 100644 (file)
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -1970,3 +1970,4 @@ static int mcdx_setattentuator(struct s_drive_stuff *stuffp,
 }
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(MITSUMI_X_CDROM_MAJOR);

diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index c435e22f9fdea921003febce2aced11d27f27d64..7e9758fe7045cce03ac22e9299784b6ee509de1e 100644 (file)
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -2102,3 +2102,4 @@ module_init(optcd_init);
 module_exit(optcd_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(OPTICS_CDROM_MAJOR);

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index c57a5d82fef1563e410fb768a0f7cab19091cdbb..df865505d369ef5497733fcd37dfc1bb163a894c 100644 (file)
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5954,6 +5954,9 @@ static int sbpcd_media_changed(struct cdrom_device_info *cdi, int disc_nr)
 }
 
 MODULE_LICENSE("GPL");
+/* FIXME: Old modules.conf claims MATSUSHITA_CDROM2_MAJOR and CDROM3, but
+   AFAICT this doesn't support those majors, so why? --RR 30 Jul 2003 */
+MODULE_ALIAS_BLOCKDEV_MAJOR(MATSUSHITA_CDROM_MAJOR);
 
 /*==========================================================================*/
 /*

diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index ae6a8237d063b2bc260466305a4ec553e8b02374..1c8362764e1ae1d82d7ec2499957252aa0877a53 100644 (file)
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -1813,3 +1813,4 @@ module_init(sjcd_init);
 module_exit(sjcd_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(SANYO_CDROM_MAJOR);

diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 2422038cc059291c188d20f833d4e58d885096a3..1467c9311000fff3613f8e4e76ae98b414fa53ff 100644 (file)
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1684,3 +1684,4 @@ module_exit(sony535_exit);
 
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(CDU535_CDROM_MAJOR);

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 99dbf0d24eaf0fb783a08669ab8ba8f134de9035..9c7e6d86e810295924c8781b0847b43a032111bb 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -12,6 +12,8 @@
 #include <linux/wait.h>
 #include <linux/mempool.h>
 #include <linux/bio.h>
+#include <linux/module.h>
+#include <linux/stringify.h>
 
 #include <asm/scatterlist.h>
 
@@ -671,6 +673,11 @@ void kblockd_flush(void);
 } \
 )
 #endif 
- 
+
+#define MODULE_ALIAS_BLOCKDEV(major,minor) \
+       MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
+#define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \
+       MODULE_ALIAS("block-major-" __stringify(major) "-*")
+
 
 #endif