[Patch]: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

[Patch]: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

[René Bolldorf]

Hi,

The scsi_wait_scan module should only be enabled if BLKD_DEV_INITRD is 
set. And i think it's better then the user can enable/disable the module 
of their own risk.

Signed-off-by: Rene Bolldorf <xsecute@googlemail.com>

========================================================================

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 9191d1e..b785703 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -258,21 +258,22 @@ config SCSI_SCAN_ASYNC
  	  or async on the kernel's command line.

  config SCSI_WAIT_SCAN
-	tristate  # No prompt here, this is an invisible symbol.
+	tristate "SCSI Wait Scan"
  	default m
  	depends on SCSI
+	depends on SCSI_SCAN_ASYNC
  	depends on MODULES
-# scsi_wait_scan is a loadable module which waits until all the async 
scans are
-# complete.  The idea is to use it in initrd/ initramfs scripts.  You 
modprobe
-# it after all the modprobes of the root SCSI drivers and it will wait 
until
-# they have all finished scanning their buses before allowing the boot to
-# proceed.  (This method is not applicable if targets boot independently in
-# parallel with the initiator, or with transports with 
non-deterministic target
-# discovery schemes, or if a transport driver does not support 
scsi_wait_scan.)
-#
-# This symbol is not exposed as a prompt because little is to be gained by
-# disabling it, whereas people who accidentally switch it off may 
wonder why
-# their mkinitrd gets into trouble.
+	depends on BLK_DEV_INITRD
+	help
+	  scsi_wait_scan is a loadable module which waits until all the async 
scans are
+	  complete.  The idea is to use it in initrd/ initramfs scripts.  You 
modprobe
+	  it after all the modprobes of the root SCSI drivers and it will wait 
until
+	  they have all finished scanning their buses before allowing the boot to
+	  proceed.  (This method is not applicable if targets boot 
independently in
+	  parallel with the initiator, or with transports with 
non-deterministic target
+	  discovery schemes, or if a transport driver does not support 
scsi_wait_scan.)
+
+	  People that use a initramfs should say Y or M.

  menu "SCSI Transports"
  	depends on SCSI

Re: [Patch]: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

[Stefan Richter]

René Bolldorf wrote:

(I'm not sure whether the maintainers are going to accept that change
this time around, but anyway:)

> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index 9191d1e..b785703 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -258,21 +258,22 @@ config SCSI_SCAN_ASYNC
>   	  or async on the kernel's command line.
> 
>   config SCSI_WAIT_SCAN
> -	tristate  # No prompt here, this is an invisible symbol.
> +	tristate "SCSI Wait Scan"
>   	default m
>   	depends on SCSI
> +	depends on SCSI_SCAN_ASYNC
>   	depends on MODULES
[...]
> +	depends on BLK_DEV_INITRD

There needs to be an additional "depends on m" now that you made it
visible, so that it cannot be set to y.

> +	help
> +	  scsi_wait_scan is a loadable module which waits until all the async scans are
> +	  complete.  The idea is to use it in initrd/ initramfs scripts.  You modprobe
> +	  it after all the modprobes of the root SCSI drivers and it will wait until
> +	  they have all finished scanning their buses before allowing the boot to
> +	  proceed.
[...]
> +	  People that use a initramfs should say Y or M.

They "...should say M." actually.
-- 
Stefan Richter
-=====-==-=- --=- =-===
http://arcgraph.de/sr/
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [Patch]: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

[René Bolldorf]

On 02/23/2010 05:08 PM, Stefan Richter wrote:
> René Bolldorf wrote:
>
> (I'm not sure whether the maintainers are going to accept that change
> this time around, but anyway:)
>
>> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
>> index 9191d1e..b785703 100644
>> --- a/drivers/scsi/Kconfig
>> +++ b/drivers/scsi/Kconfig
>> @@ -258,21 +258,22 @@ config SCSI_SCAN_ASYNC
>>    	  or async on the kernel's command line.
>>
>>    config SCSI_WAIT_SCAN
>> -	tristate  # No prompt here, this is an invisible symbol.
>> +	tristate "SCSI Wait Scan"
>>    	default m
>>    	depends on SCSI
>> +	depends on SCSI_SCAN_ASYNC
>>    	depends on MODULES
> [...]
>> +	depends on BLK_DEV_INITRD
>
> There needs to be an additional "depends on m" now that you made it
> visible, so that it cannot be set to y.
>
>> +	help
>> +	  scsi_wait_scan is a loadable module which waits until all the async scans are
>> +	  complete.  The idea is to use it in initrd/ initramfs scripts.  You modprobe
>> +	  it after all the modprobes of the root SCSI drivers and it will wait until
>> +	  they have all finished scanning their buses before allowing the boot to
>> +	  proceed.
> [...]
>> +	  People that use a initramfs should say Y or M.
>
> They "...should say M." actually.

Ok, updated. thx
I hope someone pick it up, because it's damn that the module will be 
built even with no initramfs support.

==================================================================
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 9191d1e..1cb07da 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -258,21 +258,23 @@ config SCSI_SCAN_ASYNC
  	  or async on the kernel's command line.

  config SCSI_WAIT_SCAN
-	tristate  # No prompt here, this is an invisible symbol.
+	tristate "SCSI Wait Scan"
  	default m
+	depends on m
  	depends on SCSI
+	depends on SCSI_SCAN_ASYNC
  	depends on MODULES
-# scsi_wait_scan is a loadable module which waits until all the async 
scans are
-# complete.  The idea is to use it in initrd/ initramfs scripts.  You 
modprobe
-# it after all the modprobes of the root SCSI drivers and it will wait 
until
-# they have all finished scanning their buses before allowing the boot to
-# proceed.  (This method is not applicable if targets boot independently in
-# parallel with the initiator, or with transports with 
non-deterministic target
-# discovery schemes, or if a transport driver does not support 
scsi_wait_scan.)
-#
-# This symbol is not exposed as a prompt because little is to be gained by
-# disabling it, whereas people who accidentally switch it off may 
wonder why
-# their mkinitrd gets into trouble.
+	depends on BLK_DEV_INITRD
+	help
+	  scsi_wait_scan is a loadable module which waits until all the async 
scans are
+	  complete.  The idea is to use it in initrd/ initramfs scripts.  You 
modprobe
+	  it after all the modprobes of the root SCSI drivers and it will wait 
until
+	  they have all finished scanning their buses before allowing the boot to
+	  proceed.  (This method is not applicable if targets boot 
independently in
+	  parallel with the initiator, or with transports with 
non-deterministic target
+	  discovery schemes, or if a transport driver does not support 
scsi_wait_scan.)
+
+	  People that use a initramfs should say M here.

  menu "SCSI Transports"
  	depends on SCSI
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [Patch]: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

[Joe Eykholt]

René Bolldorf wrote:
> On 02/23/2010 05:08 PM, Stefan Richter wrote:
>> René Bolldorf wrote:
>>
>> (I'm not sure whether the maintainers are going to accept that change
>> this time around, but anyway:)
>>
>>> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
>>> index 9191d1e..b785703 100644
>>> --- a/drivers/scsi/Kconfig
>>> +++ b/drivers/scsi/Kconfig
>>> @@ -258,21 +258,22 @@ config SCSI_SCAN_ASYNC
>>>          or async on the kernel's command line.
>>>
>>>    config SCSI_WAIT_SCAN
>>> -    tristate  # No prompt here, this is an invisible symbol.
>>> +    tristate "SCSI Wait Scan"
>>>        default m
>>>        depends on SCSI
>>> +    depends on SCSI_SCAN_ASYNC
>>>        depends on MODULES
>> [...]
>>> +    depends on BLK_DEV_INITRD
>>
>> There needs to be an additional "depends on m" now that you made it
>> visible, so that it cannot be set to y.
>>
>>> +    help
>>> +      scsi_wait_scan is a loadable module which waits until all the 
>>> async scans are
>>> +      complete.  The idea is to use it in initrd/ initramfs 
>>> scripts.  You modprobe
>>> +      it after all the modprobes of the root SCSI drivers and it 
>>> will wait until
>>> +      they have all finished scanning their buses before allowing 
>>> the boot to
>>> +      proceed.
>> [...]
>>> +      People that use a initramfs should say Y or M.
>>
>> They "...should say M." actually.
> 
> Ok, updated. thx
> I hope someone pick it up, because it's damn that the module will be 
> built even with no initramfs support.
> 
> ==================================================================
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index 9191d1e..1cb07da 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -258,21 +258,23 @@ config SCSI_SCAN_ASYNC
>        or async on the kernel's command line.
> 
>  config SCSI_WAIT_SCAN
> -    tristate  # No prompt here, this is an invisible symbol.
> +    tristate "SCSI Wait Scan"
>      default m
> +    depends on m

Seems wrong to me (not a Kconfig expert).  Is there a CONFIG_m symbol?
It already has 'depends on MODULES'.

>      depends on SCSI
> +    depends on SCSI_SCAN_ASYNC
>      depends on MODULES
> -# scsi_wait_scan is a loadable module which waits until all the async 
> scans are
> -# complete.  The idea is to use it in initrd/ initramfs scripts.  You 
> modprobe
> -# it after all the modprobes of the root SCSI drivers and it will wait 
> until
> -# they have all finished scanning their buses before allowing the boot to
> -# proceed.  (This method is not applicable if targets boot 
> independently in
> -# parallel with the initiator, or with transports with 
> non-deterministic target
> -# discovery schemes, or if a transport driver does not support 
> scsi_wait_scan.)
> -#
> -# This symbol is not exposed as a prompt because little is to be gained by
> -# disabling it, whereas people who accidentally switch it off may 
> wonder why
> -# their mkinitrd gets into trouble.
> +    depends on BLK_DEV_INITRD
> +    help
> +      scsi_wait_scan is a loadable module which waits until all the 
> async scans are
> +      complete.  The idea is to use it in initrd/ initramfs scripts.  
> You modprobe
> +      it after all the modprobes of the root SCSI drivers and it will 
> wait until
> +      they have all finished scanning their buses before allowing the 
> boot to
> +      proceed.  (This method is not applicable if targets boot 
> independently in
> +      parallel with the initiator, or with transports with 
> non-deterministic target
> +      discovery schemes, or if a transport driver does not support 
> scsi_wait_scan.)
> +
> +      People that use a initramfs should say M here.
> 
>  menu "SCSI Transports"
>      depends on SCSI
> -- 
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [Patch]: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

[Stefan Richter]

Joe Eykholt wrote:
> René Bolldorf wrote:
>> On 02/23/2010 05:08 PM, Stefan Richter wrote:
>>> There needs to be an additional "depends on m" now that you made it
>>> visible, so that it cannot be set to y.
[...]
>>  config SCSI_WAIT_SCAN
>> -    tristate  # No prompt here, this is an invisible symbol.
>> +    tristate "SCSI Wait Scan"
>>      default m
>> +    depends on m
> 
> Seems wrong to me (not a Kconfig expert).  Is there a CONFIG_m symbol?

"m" is a value, not a symbol.  It is explained at the end of
Documentation/kbuild/kconfig-language.txt.

> It already has 'depends on MODULES'.
> 
>>      depends on SCSI
>> +    depends on SCSI_SCAN_ASYNC
>>      depends on MODULES

This on the other hand is a symbol which is set if loadable module
support is desired.

(Now that you mention it, "depends on m" actually implies "depends on
MODULES".  But not vice versa.)
-- 
Stefan Richter
-=====-==-=- --=- =-===
http://arcgraph.de/sr/
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html