diff options
| author | Patrick Mansfield <patmans@us.ibm.com> | 2002-11-19 07:20:26 -0600 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2002-11-19 07:20:26 -0600 |
| commit | a1a477f95347eb8ec71d48dd39f600e0730a12e9 (patch) | |
| tree | 09128231e056c25453c9e27a3d3c069cd2569265 | |
| parent | 4e13766b137646d90ef9b7182b986a63c0edce41 (diff) | |
[PATCH] Re: 2.5.48 /proc/scsi directory missing
On Tue, Nov 19, 2002 at 10:45:25AM +1100, Douglas Gilbert wrote:
> That directory (and all who sail in her, e.g. /proc/scsi/scsi)
> seems to have disappeared. When the scsi_debug module is
> loaded a /proc/scsi_debug/0 entry appears (that used to be
> /proc/scsi/scsi_debug/0).
>
> Doug Gilbert
It looks like the merge of Doug and Christoph's code dropped two calls
(unless the exit devfs_unregister was supposed to be removed).
Here's a patch for the addition of scsi_init_procfs, devfs_mk_dir and
bus_unregister calls, and a small reordering so calls in exit_scsi
match the reverse of those in init_scsi.
| -rw-r--r-- | drivers/scsi/scsi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 82f1a2ef39ec..0fb4ddce4eda 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -2224,6 +2224,8 @@ static int __init init_scsi(void) printk(KERN_ERR "SCSI: can't init sg mempool %s\n", sgp->name); } + scsi_init_procfs(); + scsi_devfs_handle = devfs_mk_dir(NULL, "scsi", NULL); scsi_host_init(); scsi_dev_info_list_init(scsi_dev_flags); bus_register(&scsi_driverfs_bus_type); @@ -2235,9 +2237,10 @@ static void __exit exit_scsi(void) { int i; + bus_unregister(&scsi_driverfs_bus_type); + scsi_dev_info_list_delete(); devfs_unregister(scsi_devfs_handle); scsi_exit_procfs(); - scsi_dev_info_list_delete(); for (i = 0; i < SG_MEMPOOL_NR; i++) { struct scsi_host_sg_pool *sgp = scsi_sg_pools + i; |