Hello,
> > [...]
> > config SCSI_WAIT_SCAN
> > tristate
> > - default m
> > - depends on SCSI
> > - depends on MODULES
> > + default m if SCSI=m
> > + default n
>
> Note that this also means SCSI_WAIT_SCAN=n (will not get compiled
> and built even as a module) if SCSI=y. But this is perfectly fine, because
> I see:
>
> #ifndef MODULE
> late_initcall(scsi_complete_async_scans);
> #endif
>
> in drivers/scsi/scsi_scan.c anyway, so the async scans will be waited
> upon and get complete even when SCSI=y and scsi_scan_type=async,
> i.e. you don't really need the scsi_wait_scan module in that case anyway.
It seems there is a:
late_initcall(wait_scan_init);
in drivers/scsi/scsi_wait_scan.c too. So we can get rid of the redundant:
#ifndef MODULE
late_initcal(scsi_complete_async_scans);
#endif
in drivers/scsi/scsi_scan.c by enforcing SCSI_WAIT_SCAN=y when
SCSI=y (and =m when SCSI=m).
I guess this is probably the behaviour that James wanted originally?
Anyway, attached patch (subsumes previous one) cleans up all this.
Now, scsi_wait_scan is the only guy who controls waiting upon async
scans to complete:
If SCSI=n, SCSI_WAIT_SCAN=n, obviously.
If SCSI=y, SCSI_WAIT_SCAN=y, so it gets built-in and is run at
late_initcall.
If SCSI=m, SCSI_WAIT_SCAN=m too and would hopefully be run
by the initrd/initramfs scripts to wait for async SCSI bus scans to
finish before allowing the boot to proceed.
[ Attached patch does _not_ expose SCSI_WAIT_SCAN to the
user at kernel configuration time, so if somebody wants it to be
built as a module even when SCSI=y (why would anybody
want that, doesn't make much sense to me to modprobe
scsi_wait_scan _after_ boot-up), it would not be possible to
do so. But if someone really wants that, let me know, we can
add a depends, tristate "..." and help in this Kconfig option to
accomplish that too. ]
This has sadly become a one-person thread, but Robert informs
me in private mail that we can further clean/simplify the patch:
[subsumes both previous patches]
Signed-off-by: Satyam Sharma <[email protected]>
---
drivers/scsi/Kconfig | 3 +--
drivers/scsi/scsi_scan.c | 5 +----
2 files changed, 2 insertions(+), 6 deletions(-)
---
diff -ruNp a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
--- a/drivers/scsi/Kconfig 2007-05-10 23:19:32.000000000 +0530
+++ b/drivers/scsi/Kconfig 2007-05-14 17:59:51.000000000 +0530
@@ -243,9 +243,8 @@ config SCSI_SCAN_ASYNC
config SCSI_WAIT_SCAN
tristate
- default m
depends on SCSI
- depends on MODULES
+ default SCSI
menu "SCSI Transports"
depends on SCSI
diff -ruNp a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
--- a/drivers/scsi/scsi_scan.c 2007-05-14 16:06:43.000000000 +0530
+++ b/drivers/scsi/scsi_scan.c 2007-05-14 16:10:34.000000000 +0530
@@ -184,14 +184,11 @@ int scsi_complete_async_scans(void)
/* Only exported for the benefit of scsi_wait_scan */
EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
-#ifndef MODULE
/*
* For async scanning we need to wait for all the scans to complete before
* trying to mount the root fs. Otherwise non-modular drivers may not be ready
- * yet.
+ * yet. This is done by scsi_wait_scan.
*/
-late_initcall(scsi_complete_async_scans);
-#endif
/**
* scsi_unlock_floptical - unlock device via a special MODE SENSE command
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
