From: Mike Anderson <andmike@us.ibm.com>
This is a refresh of a patch by Alan Stern to correct the removal of scsi
procfs host enteries
http://marc.theaimsgroup.com/?l=linux-scsi&m=105545175600506&w=2
This patch also contains a join of another patch that reduces the users
of scsi_host present.
drivers/scsi/NCR53c406a.c | 5 ++--
drivers/scsi/aacraid/linit.c | 1
drivers/scsi/hosts.c | 4 +--
drivers/scsi/scsi_module.c | 2 -
drivers/scsi/scsi_priv.h | 4 +++
drivers/scsi/scsi_proc.c | 49 ++++++++++++++++++++++++++++---------------
6 files changed, 42 insertions(+), 23 deletions(-)
diff -puN drivers/scsi/aacraid/linit.c~ppa-fix drivers/scsi/aacraid/linit.c
--- 25/drivers/scsi/aacraid/linit.c~ppa-fix 2003-07-19 17:05:05.000000000 -0700
+++ 25-akpm/drivers/scsi/aacraid/linit.c 2003-07-19 17:05:05.000000000 -0700
@@ -295,7 +295,6 @@ static int aac_detect(Scsi_Host_Template
printk(KERN_WARNING "aacraid: unable to register \"aac\" device.\n");
}
- template->present = aac_count; /* # of cards of this type found */
return aac_count;
}
diff -puN drivers/scsi/hosts.c~ppa-fix drivers/scsi/hosts.c
--- 25/drivers/scsi/hosts.c~ppa-fix 2003-07-19 17:05:05.000000000 -0700
+++ 25-akpm/drivers/scsi/hosts.c 2003-07-19 17:05:05.000000000 -0700
@@ -108,7 +108,7 @@ void scsi_free_shost(struct Scsi_Host *s
shost->eh_notify = NULL;
}
- shost->hostt->present--;
+ scsi_proc_hostdir_rm(shost->hostt);
scsi_destroy_command_freelist(shost);
kfree(shost);
}
@@ -209,7 +209,7 @@ struct Scsi_Host *scsi_host_alloc(struct
kernel_thread((int (*)(void *))scsi_error_handler, shost, 0);
wait_for_completion(&complete);
shost->eh_notify = NULL;
- shost->hostt->present++;
+ scsi_proc_hostdir_add(shost->hostt);
return shost;
fail:
kfree(shost);
diff -puN drivers/scsi/NCR53c406a.c~ppa-fix drivers/scsi/NCR53c406a.c
--- 25/drivers/scsi/NCR53c406a.c~ppa-fix 2003-07-19 17:05:05.000000000 -0700
+++ 25-akpm/drivers/scsi/NCR53c406a.c 2003-07-19 17:05:05.000000000 -0700
@@ -450,6 +450,7 @@ static __inline__ int NCR53c406a_pio_wri
static int __init NCR53c406a_detect(Scsi_Host_Template * tpnt)
{
+ int present = 0;
struct Scsi_Host *shpnt = NULL;
#ifndef PORT_BASE
int i;
@@ -522,7 +523,7 @@ static int __init NCR53c406a_detect(Scsi
DEB(printk("NCR53c406a: using port_base 0x%x\n", port_base));
- tpnt->present = 1;
+ present = 1;
tpnt->proc_name = "NCR53c406a";
shpnt = scsi_register(tpnt, 0);
@@ -576,7 +577,7 @@ static int __init NCR53c406a_detect(Scsi
sprintf(info_msg, "NCR53c406a at 0x%x, IRQ %d, %s PIO mode.", port_base, irq_level, fast_pio ? "fast" : "slow");
#endif
- return (tpnt->present);
+ return (present);
#if USE_DMA
err_free_irq:
diff -puN drivers/scsi/scsi_module.c~ppa-fix drivers/scsi/scsi_module.c
--- 25/drivers/scsi/scsi_module.c~ppa-fix 2003-07-19 17:05:05.000000000 -0700
+++ 25-akpm/drivers/scsi/scsi_module.c 2003-07-19 17:05:05.000000000 -0700
@@ -33,7 +33,7 @@ static int __init init_this_scsi_driver(
INIT_LIST_HEAD(&sht->legacy_hosts);
sht->detect(sht);
- if (!sht->present)
+ if (list_empty(&sht->legacy_hosts))
return -ENODEV;
list_for_each_entry(shost, &sht->legacy_hosts, sht_legacy_list) {
diff -puN drivers/scsi/scsi_priv.h~ppa-fix drivers/scsi/scsi_priv.h
--- 25/drivers/scsi/scsi_priv.h~ppa-fix 2003-07-19 17:05:05.000000000 -0700
+++ 25-akpm/drivers/scsi/scsi_priv.h 2003-07-19 17:05:05.000000000 -0700
@@ -90,11 +90,15 @@ extern void scsi_exit_queue(void);
/* scsi_proc.c */
#ifdef CONFIG_PROC_FS
+extern void scsi_proc_hostdir_add(struct scsi_host_template *);
+extern void scsi_proc_hostdir_rm(struct scsi_host_template *);
extern void scsi_proc_host_add(struct Scsi_Host *);
extern void scsi_proc_host_rm(struct Scsi_Host *);
extern int scsi_init_procfs(void);
extern void scsi_exit_procfs(void);
#else
+# define scsi_proc_hostdir_add(sht) do { } while (0)
+# define scsi_proc_hostdir_rm(sht) do { } while (0)
# define scsi_proc_host_add(shost) do { } while (0)
# define scsi_proc_host_rm(shost) do { } while (0)
# define scsi_init_procfs() (0)
diff -puN drivers/scsi/scsi_proc.c~ppa-fix drivers/scsi/scsi_proc.c
--- 25/drivers/scsi/scsi_proc.c~ppa-fix 2003-07-19 17:05:05.000000000 -0700
+++ 25-akpm/drivers/scsi/scsi_proc.c 2003-07-19 17:05:05.000000000 -0700
@@ -41,6 +41,8 @@
struct proc_dir_entry *proc_scsi;
EXPORT_SYMBOL(proc_scsi);
+/* Protect sht->present and sht->proc_dir */
+static DECLARE_MUTEX(global_host_template_sem);
static int proc_scsi_read(char *buffer, char **start, off_t offset,
int length, int *eof, void *data)
@@ -77,16 +79,10 @@ out:
return ret;
}
-void scsi_proc_host_add(struct Scsi_Host *shost)
+void scsi_proc_hostdir_add(struct scsi_host_template *sht)
{
- struct scsi_host_template *sht = shost->hostt;
- struct proc_dir_entry *p;
- char name[10];
-
- if (!sht->proc_info)
- return;
-
- if (!sht->proc_dir) {
+ down(&global_host_template_sem);
+ if (!sht->present++) {
sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi);
if (!sht->proc_dir) {
printk(KERN_ERR "%s: proc_mkdir failed for %s\n",
@@ -95,6 +91,27 @@ void scsi_proc_host_add(struct Scsi_Host
}
sht->proc_dir->owner = sht->module;
}
+ up(&global_host_template_sem);
+}
+
+void scsi_proc_hostdir_rm(struct scsi_host_template *sht)
+{
+ down(&global_host_template_sem);
+ if (!--sht->present && sht->proc_dir) {
+ remove_proc_entry(sht->proc_name, proc_scsi);
+ sht->proc_dir = NULL;
+ }
+ up(&global_host_template_sem);
+}
+
+void scsi_proc_host_add(struct Scsi_Host *shost)
+{
+ struct scsi_host_template *sht = shost->hostt;
+ struct proc_dir_entry *p;
+ char name[10];
+
+ if (!sht->proc_dir)
+ return;
sprintf(name,"%d", shost->host_no);
p = create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR,
@@ -107,20 +124,18 @@ void scsi_proc_host_add(struct Scsi_Host
}
p->write_proc = proc_scsi_write_proc;
- p->owner = shost->hostt->module;
+ p->owner = sht->module;
}
void scsi_proc_host_rm(struct Scsi_Host *shost)
{
- struct scsi_host_template *sht = shost->hostt;
char name[10];
- if (sht->proc_info) {
- sprintf(name,"%d", shost->host_no);
- remove_proc_entry(name, sht->proc_dir);
- if (!sht->present)
- remove_proc_entry(sht->proc_name, proc_scsi);
- }
+ if (!shost->hostt->proc_dir)
+ return;
+
+ sprintf(name,"%d", shost->host_no);
+ remove_proc_entry(name, shost->hostt->proc_dir);
}
static int proc_print_scsidevice(struct device *dev, void *data)
_