Skip to contentSkip to conversation

: Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

PATCH In review René Bolldorf 3 participants 5 messages Feb 22, 2010 – Feb 23, 2010 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Enable SCSI Wait Scan only if BLK_DEV_INITRD is set.

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.

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

drivers/scsi/Kconfig +13 -12
index 9191d1e..b785703 100644
@@ -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
#1 lore raw

René Bolldorf wrote:

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

Quoted 14 lines
drivers/scsi/Kconfig +2 -1
index 9191d1e..b785703 100644
@@ -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

[...]

drivers/scsi/Kconfig config SCSI_SCAN_ASYNC · line 266

Quoted 1 line
drivers/scsi/Kconfig +1 -0
+	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.

Quoted 6 lines
drivers/scsi/Kconfig +6 -0
+	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.

[...]

drivers/scsi/Kconfig config SCSI_SCAN_ASYNC · line 276

Quoted 1 line
drivers/scsi/Kconfig +1 -0
+	  People that use a initramfs should say Y or M.

They "...should say M." actually.

Signature · 7 lines
Stefan Richter
-=====-==-=- --=- =-===
http://arcgraph.de/sr/
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 32 lines · Stefan Richter

René Bolldorf wrote:

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

Quoted 14 lines
drivers/scsi/Kconfig +2 -1
index 9191d1e..b785703 100644
@@ -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

[...]

drivers/scsi/Kconfig

Quoted 1 line
drivers/scsi/Kconfig +1 -0
+	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.

Quoted 6 lines
drivers/scsi/Kconfig +6 -0
+	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.

[...]

Quoted 3 lines

drivers/scsi/Kconfig

Quoted 1 line
drivers/scsi/Kconfig +1 -0
+	  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.

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

drivers/scsi/Kconfig +14 -12
index 9191d1e..1cb07da 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 50 lines · René Bolldorf
Quoted 35 lines · Stefan Richter

René Bolldorf wrote:

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

Quoted 14 lines
drivers/scsi/Kconfig +2 -1
index 9191d1e..b785703 100644
@@ -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

[...]

Quoted 1 line

+ 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.

Quoted 10 lines
drivers/scsi/Kconfig +2 -0
+    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.

Quoted 4 lines

[...]

Quoted 1 line

+ 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.

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

drivers/scsi/Kconfig +0 -0
index 9191d1e..1cb07da 100644

drivers/scsi/Kconfig config SCSI_SCAN_ASYNC · line 263

Quoted 7 lines
drivers/scsi/Kconfig +2 -1
@@ -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'.

Quoted 46 lines
drivers/scsi/Kconfig +1 -1
     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

drivers/scsi/Kconfig +0 -2
-# 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.)

drivers/scsi/Kconfig +0 -3
-#
-# 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

drivers/scsi/Kconfig +3 -1
-# 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.)

drivers/scsi/Kconfig +2 -0
+
+      People that use a initramfs should say M here.
 
 menu "SCSI Transports"
     depends on SCSI
Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
Quoted 4 lines · Joe Eykholt
Quoted 3 lines · René Bolldorf
Quoted 2 lines · Stefan Richter

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

[...]

Quoted 7 lines

drivers/scsi/Kconfig config SCSI_SCAN_ASYNC · line 263

Quoted 5 lines

config SCSI_WAIT_SCAN

drivers/scsi/Kconfig +2 -1
-    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.

Quoted 5 lines

It already has 'depends on MODULES'.

Quoted 3 lines

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.)

Signature · 7 lines
Stefan Richter
-=====-==-=- --=- =-===
http://arcgraph.de/sr/
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html