From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Date: Fri, 25 Feb 2005 22:07:25 +0000 Subject: Re: [ANNOUNCE] hotplug-ng 001 release Message-Id: <20050225220725.GA27405@suse.de> List-Id: References: <20050211004033.GA26624@suse.de> In-Reply-To: <20050211004033.GA26624@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hotplug@vger.kernel.org On Wed, Feb 16, 2005 at 02:07:52PM +0300, Roman Kagan wrote: > Below is the promised patch dealing with scsi module loading (can't > compile-test it at the moment, sorry). It has two caveats (I suspect > you'll find more :) : > > 1) I'm not particularly certain about the "scsi-type-" prefix: it may > resemble cases where request_module() is used; > > 2) TYPE_* macros in include/linux/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 st, sd_mod and sr_mod cases (as > hotplug-ng-001/module_scsi.c did). Are there any other? > > Cheers, > Roman. > > diff -ruNp -x '*~' linux-2.6.11-rc4.hotplug.orig/drivers/scsi/scsi_sysfs.c linux-2.6.11-rc4.hotplug/drivers/scsi/scsi_sysfs.c > --- linux-2.6.11-rc4.hotplug.orig/drivers/scsi/scsi_sysfs.c 2005-02-13 06:05:41.000000000 +0300 > +++ linux-2.6.11-rc4.hotplug/drivers/scsi/scsi_sysfs.c 2005-02-16 04:19:07.000000000 +0300 > @@ -202,9 +202,29 @@ static int scsi_bus_match(struct device > return (sdp->inq_periph_qual = SCSI_INQ_PQ_CON)? 1: 0; > } > > +#ifdef CONFIG_HOTPLUG Don't ifdef it. > +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; > +} > +#endif > + > struct bus_type scsi_bus_type = { > .name = "scsi", > .match = scsi_bus_match, > +#ifdef CONFIG_HOTPLUG > + .hotplug = scsi_hotplug, No ifdef needed here either. Other than those minor things, the patch looks good. Care to resend it with a "Signed-off-by:" line and the same description above (but fixed) so I can apply it to the kernel tree? thanks, greg k-h ------------------------------------------------------- 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 Linux-hotplug-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel