MODULE_ALIAS() in block devices
Subsystems (2)
PATCH 1/3 MODULE_ALIAS() in block devices
Name: MODULE_ALIAS inside modules: block devices
Author: Rusty Russell
Status: Booted on 2.6.0-test4-bk3
D: Previously, default aliases were hardwired into modutils. Now they
D: should be inside the modules, using MODULE_ALIAS() (they will be overridden
D: by any user alias).
include/linux/blkdev.h +8 -1
@@ -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>
@@ -667,6 +665,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
drivers/block/floppy.c +2 -0
@@ -4599,3 +4599,5 @@ MODULE_PARM(FLOPPY_DMA,"i");__setup ("floppy=" , floppy_setup); module_init(floppy_init)#endif + +MODULE_ALIAS_BLOCKDEV_MAJOR (FLOPPY_MAJOR );
drivers/block/xd.c +2 -2
@@ -1098,5 +1098,5 @@ __setup ("xd_geo=", xd_manual_geo_init);#endif /* MODULE */ +module_init (xd_init); +MODULE_ALIAS_BLOCKDEV_MAJOR (XT_DISK_MAJOR ); -module_init (xd_init) -
drivers/cdrom/aztcd.c +1 -0
@@ -2492,3 +2492,4 @@ static int azt_bcd2bin(unsigned char bcd }MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (AZTECH_CDROM_MAJOR );
drivers/cdrom/cdu31a.c +1 -0
@@ -3495,3 +3495,4 @@ module_init(cdu31a_init);module_exit (cdu31a_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (CDU31A_CDROM_MAJOR );
drivers/cdrom/cm206.c +1 -1
@@ -1611,7 +1611,7 @@ static int __init cm206_setup(char *s)__setup ("cm206=" , cm206_setup);#endif /* !MODULE */ +MODULE_ALIAS_BLOCKDEV_MAJOR (CM206_CDROM_MAJOR ); -/* * Local variables:
drivers/cdrom/gscd.c +1 -0
@@ -1023,3 +1023,4 @@ MODULE_AUTHOR("Oliver Raupach <raupach@nMODULE_LICENSE ("GPL" );module_init (gscd_init);module_exit (gscd_exit); +MODULE_ALIAS_BLOCKDEV_MAJOR (GOLDSTAR_CDROM_MAJOR );
drivers/cdrom/mcd.c +1 -0
@@ -1556,3 +1556,4 @@ module_exit(mcd_exit);MODULE_AUTHOR ("Martin Harriss" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (MITSUMI_CDROM_MAJOR );
drivers/cdrom/mcdx.c +1 -0
@@ -1962,3 +1962,4 @@ static int mcdx_setattentuator(struct s_ }MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (MITSUMI_X_CDROM_MAJOR );
drivers/cdrom/optcd.c +1 -0
@@ -2095,3 +2095,4 @@ module_init(optcd_init);module_exit (optcd_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (OPTICS_CDROM_MAJOR );
drivers/cdrom/sbpcd.c +3 -0
@@ -5946,6 +5946,9 @@ static int sbpcd_media_changed(struct cd }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 );/*==========================================================================*/ /*
drivers/cdrom/sjcd.c +1 -0
@@ -1809,3 +1809,4 @@ module_init(sjcd_init);module_exit (sjcd_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (SANYO_CDROM_MAJOR );
drivers/cdrom/sonycd535.c +1 -0
@@ -1678,3 +1678,4 @@ module_exit(sony535_exit);MODULE_LICENSE ("GPL" ); +MODULE_ALIAS_BLOCKDEV_MAJOR (CDU535_CDROM_MAJOR );
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.