diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-08-20 09:18:48 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-12 14:51:06 -0400 |
| commit | a57b1fccdfa65b78481f5e651833d979e545de04 (patch) | |
| tree | d70028d8df64fd12d8a583da18a31f9de6a853ae /drivers/scsi/scsi_scan.c | |
| parent | 31765d7d3da9bb575f80faecae0b931afa3532c6 (diff) | |
| download | linux-stable-a57b1fccdfa65b78481f5e651833d979e545de04.tar.gz linux-stable-a57b1fccdfa65b78481f5e651833d979e545de04.tar.bz2 linux-stable-a57b1fccdfa65b78481f5e651833d979e545de04.zip | |
[SCSI] scsi_scan: Cope with kthread_run failing
If kthread_run failed, we would fail to scan the host, and leak the
allocated async_scan_data. Since using a separate thread is just an
optimisation, do the scan synchronously if we fail to spawn a thread.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 20df7fe4f48f..b53c5f67e372 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1799,6 +1799,7 @@ static int do_scan_async(void *_data) **/ void scsi_scan_host(struct Scsi_Host *shost) { + struct task_struct *p; struct async_scan_data *data; if (strncmp(scsi_scan_type, "none", 4) == 0) @@ -1810,7 +1811,9 @@ void scsi_scan_host(struct Scsi_Host *shost) return; } - kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no); + p = kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no); + if (unlikely(IS_ERR(p))) + do_scan_async(data); } EXPORT_SYMBOL(scsi_scan_host); |