Re: [PATCH] add help to WAIT_SCAN option

[Matthew Wilcox <matthew@wil.cx>]

On Sun, May 27, 2007 at 01:10:36AM +0200, Thibaut VARENE wrote:
> >diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
> 
> Works For Me (tm)

Great, thanks!

James, can you put this patch into your tree?

-----

When all scsi drivers are built-in, we need to automatically call
scsi_complete_async_scans before we need to find the root filesystem.
This used to be done by compiling scsi_wait_scan into the kernel, but
that doesn't work when some scsi drivers are modular.  Instead, just add
a late_initcall() when the SCSI subsystem is built-in.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index a67f315..2653a06 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -184,6 +184,11 @@ int scsi_complete_async_scans(void)
 /* Only exported for the benefit of scsi_wait_scan */
 EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
 
+/* If everything's built in, we need to wait for everything to scan */
+#ifndef MODULE
+late_initcall(scsi_complete_async_scans);
+#endif
+
 /**
  * scsi_unlock_floptical - unlock device via a special MODE SENSE command
  * @sdev:	scsi device to send command to