drivers/scsi: add hotplug with MODNAME env var

PATCH New Roman Kagan 1 participant 1 message Mar 4, 2005

Subsystems (2)

SCSI SCSI tape driver

lore

Share & tools

lore

Roman Kagan

author

2005-03-04 10:49 UTC #0 lore raw

PATCH 1/1 drivers/scsi: add hotplug with MODNAME env var

Hi,

The patch below adds hotplug callout to scsi_bus_type, and makes it generate MODNAME environment variable for use with modprobe. Also it adds a few matching MODULE_ALIAS() macros to the appropriate modules.

Two caveats:

1) I'm not particularly certain about the "scsi-type-" prefix: it may resemble cases where request_module() is used; the reason I used dashes was that MODULE_ALIAS() macros were put manually into the code, rather that automatically generated from a corresponding *_dev_id table;

2) TYPE_* macros in include/scsi/scsi.h are in hex and can't be conveniently __stringify()-ed, so I've hardcoded the values and inserted comments next to them referring to those macros.

It handles only sd, sr, st, and osst cases. I'd like to leave it to scsi folks to decide whether sg should be "scsi-type-*" or the explicit list of types not handled by other modules.

Roman.

Signed-off-by Roman Kagan <[email protected]>

 drivers/scsi/scsi_sysfs.c |   16 ++++++++++++++++
 drivers/scsi/sd.c         |    2 ++
 drivers/scsi/sr.c         |    3 +++
 drivers/scsi/st.c         |    2 ++
 drivers/scsi/osst.c       |    2 ++
 5 files changed, 25 insertions(+)

drivers/scsi/scsi_sysfs.c +16 -0

diff -rup linux-2.6.11/drivers/scsi/scsi_sysfs.c linux-2.6.11.modname/drivers/scsi/scsi_sysfs.c
@@ -202,9 +202,25 @@ static int scsi_bus_match(struct device 
 	return (sdp->inq_periph_qual = SCSI_INQ_PQ_CON)? 1: 0;
 }
 
+static int scsi_hotplug(struct device *dev, char **envp,
+			int num_envp, char *buffer, int buffer_size)
+{
+	struct scsi_device *sdev = to_scsi_device(dev);
+	int i = 0;
+	int length = 0;
+
+	if (add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
+				"MODNAME=scsi-type-%d", sdev->type))
+		return -ENOMEM;
+
+	envp[i] = NULL;
+	return 0;
+}
+
 struct bus_type scsi_bus_type = {
         .name		= "scsi",
         .match		= scsi_bus_match,
+	.hotplug	= scsi_hotplug,
 };
 
 int scsi_sysfs_register(void)

drivers/scsi/sd.c +2 -0

diff -rup linux-2.6.11/drivers/scsi/sd.c linux-2.6.11.modname/drivers/scsi/sd.c
@@ -1653,6 +1653,8 @@ static void __exit exit_sd(void)
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Eric Youngdale");
 MODULE_DESCRIPTION("SCSI disk (sd) driver");
+MODULE_ALIAS("scsi-type-0");	/*	TYPE_DISK	*/
+MODULE_ALIAS("scsi-type-7");	/*	TYPE_MOD	*/
 
 module_init(init_sd);
 module_exit(exit_sd);

drivers/scsi/sr.c +3 -0

diff -rup linux-2.6.11/drivers/scsi/sr.c linux-2.6.11.modname/drivers/scsi/sr.c
@@ -956,6 +956,9 @@ static void __exit exit_sr(void)
 	unregister_blkdev(SCSI_CDROM_MAJOR, "sr");
 }
 
+MODULE_ALIAS("scsi-type-4");	/*	TYPE_WORM	*/
+MODULE_ALIAS("scsi-type-5");	/*	TYPE_ROM	*/
+
 module_init(init_sr);
 module_exit(exit_sr);
 MODULE_LICENSE("GPL");

drivers/scsi/st.c +2 -0

diff -rup linux-2.6.11/drivers/scsi/st.c linux-2.6.11.modname/drivers/scsi/st.c
@@ -4090,6 +4090,8 @@ static void __exit exit_st(void)
 	printk(KERN_INFO "st: Unloaded.\n");
 }
 
+MODULE_ALIAS("scsi-type-1");	/*	TYPE_TAPE	*/
+
 module_init(init_st);
 module_exit(exit_st);

drivers/scsi/osst.c +2 -0

diff -rup linux-2.6.11/drivers/scsi/osst.c linux-2.6.11.modname/drivers/scsi/osst.c
@@ -5888,5 +5888,7 @@ static void __exit exit_osst (void)
 	printk(KERN_INFO "osst :I: Unloaded.\n");
 }
 
+MODULE_ALIAS("scsi-type-1");	/*	TYPE_TAPE	*/
+
 module_init(init_osst);
 module_exit(exit_osst);

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id396&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel