From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263628AbTIBISg (ORCPT ); Tue, 2 Sep 2003 04:18:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263634AbTIBISg (ORCPT ); Tue, 2 Sep 2003 04:18:36 -0400 Received: from dp.samba.org ([66.70.73.150]:5526 "EHLO lists.samba.org") by vger.kernel.org with ESMTP id S263628AbTIBIS3 (ORCPT ); Tue, 2 Sep 2003 04:18:29 -0400 From: Rusty Russell To: akpm@zip.com.au Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] MODULE_ALIAS() in block devices Date: Tue, 02 Sep 2003 18:17:02 +1000 Message-Id: <20030902081829.1826B2C14F@lists.samba.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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). diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/include/linux/blkdev.h working-2.6.0-test2-aliases/include/linux/blkdev.h --- linux-2.6.0-test2/include/linux/blkdev.h 2003-07-30 09:39:10.000000000 +1000 +++ working-2.6.0-test2-aliases/include/linux/blkdev.h 2003-07-28 04:35:30.000000000 +1000 @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include @@ -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 diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/drivers/block/floppy.c working-2.6.0-test2-aliases/drivers/block/floppy.c --- linux-2.6.0-test2/drivers/block/floppy.c 2003-07-30 09:39:02.000000000 +1000 +++ working-2.6.0-test2-aliases/drivers/block/floppy.c 2003-07-28 04:35:20.000000000 +1000 @@ -4599,3 +4599,5 @@ MODULE_PARM(FLOPPY_DMA,"i"); __setup ("floppy=", floppy_setup); module_init(floppy_init) #endif + +MODULE_ALIAS_BLOCKDEV_MAJOR(FLOPPY_MAJOR); diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/drivers/block/xd.c working-2.6.0-test2-aliases/drivers/block/xd.c --- linux-2.6.0-test2/drivers/block/xd.c 2003-07-30 09:40:05.000000000 +1000 +++ working-2.6.0-test2-aliases/drivers/block/xd.c 2003-07-28 04:35:20.000000000 +1000 @@ -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) - diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/drivers/cdrom/aztcd.c working-2.6.0-test2-aliases/drivers/cdrom/aztcd.c --- linux-2.6.0-test2/drivers/cdrom/aztcd.c 2003-07-30 09:54:38.000000000 +1000 +++ working-2.6.0-test2-aliases/drivers/cdrom/aztcd.c 2003-07-28 04:35:20.000000000 +1000 @@ -2492,3 +2492,4 @@ static int azt_bcd2bin(unsigned char bcd } MODULE_LICENSE("GPL"); +MODULE_ALIAS_BLOCKDEV_MAJOR(AZTECH_CDROM_MAJOR); diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/drivers/cdrom/cdu31a.c working-2.6.0-test2-aliases/drivers/cdrom/cdu31a.c --- linux-2.6.0-test2/drivers/cdrom/cdu31a.c 2003-07-30 09:42:23.000000000 +1000 +++ working-2.6.0-test2-aliases/drivers/cdrom/cdu31a.c 2003-07-28 04:35:20.000000000 +1000 @@ -3495,3 +3495,4 @@ module_init(cdu31a_init); module_exit(cdu31a_exit); MODULE_LICENSE("GPL"); +MODULE_ALIAS_BLOCKDEV_MAJOR(CDU31A_CDROM_MAJOR); diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/drivers/cdrom/cm206.c working-2.6.0-test2-aliases/drivers/cdrom/cm206.c --- linux-2.6.0-test2/drivers/cdrom/cm206.c 2003-07-30 09:55:04.000000000 +1000 +++ working-2.6.0-test2-aliases/drivers/cdrom/cm206.c 2003-07-28 04:35:20.000000000 +1000 @@ -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: diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.0-test2/drivers/cdrom/gscd.c working-2.6.0-test2-aliases/drivers/cdrom/gscd.c --- linux-2.6.0-test2/drivers/cdrom/gscd.c 2003-07-30 09:44:10.000000000 +1000 +++ working-2.6.0-test2-aliases/drivers/cdrom/gscd.c 2003-07-28 04:35:20.000000000 +1000 @@ -1023,3 +1023,4 @@ MODULE_AUTHOR("Oliver Raupach