From 7e19edfc352a842bc255e89c16c32121b741c584 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Mon, 20 Aug 2007 09:18:48 -0600 Subject: [PATCH] --- yaml --- r: 68929 b: refs/heads/master c: a57b1fccdfa65b78481f5e651833d979e545de04 h: refs/heads/master i: 68927: 73b8759a14f2cde6fc6e52f92c8520d1edece5fd v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_scan.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc5c4a5b2dec..d16574b7a7fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31765d7d3da9bb575f80faecae0b931afa3532c6 +refs/heads/master: a57b1fccdfa65b78481f5e651833d979e545de04 diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c index 20df7fe4f48f..b53c5f67e372 100644 --- a/trunk/drivers/scsi/scsi_scan.c +++ b/trunk/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);