diff options
author | James Bottomley <JBottomley@Parallels.com> | 2012-05-27 05:13:46 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-07-20 03:58:13 -0400 |
commit | 6072609d9bb91ff54aee3ef29304bd5b4fc88aae (patch) | |
tree | b3bbd37150e0fdf9592eb2a7cff9dfa398a7303e /drivers | |
parent | 4e5fae7adbe4f21538b9e62c0fc9b029bbd606cb (diff) |
[SCSI] Remove scsi_wait_scan module
scsi_wait_scan was introduced with asynchronous host scanning as a hack
for distributions that weren't using proper udev based wait for root to
appear in their initramfs scripts. In 2.6.30 Commit
c751085943362143f84346d274e0011419c84202
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sun Apr 12 20:06:56 2009 +0200
PM/Hibernate: Wait for SCSI devices scan to complete during resume
Actually broke scsi_wait_scan because it renders
scsi_complete_async_scans() a nop for modular SCSI if you include
scsi_scans.h (which this module does).
The lack of bug reports is sufficient proof that this module is no
longer used.
Cc: Jeff Mahoney <jeffm@suse.de>
Cc: Dave Jones <davej@redhat.com>
Cc: maximilian attems <max@stro.at>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/Kconfig | 17 | ||||
-rw-r--r-- | drivers/scsi/Makefile | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_wait_scan.c | 37 |
3 files changed, 0 insertions, 56 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e9559782d3ec..6c810dbef7ae 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -263,23 +263,6 @@ config SCSI_SCAN_ASYNC | |||
263 | You can override this choice by specifying "scsi_mod.scan=sync" | 263 | You can override this choice by specifying "scsi_mod.scan=sync" |
264 | or async on the kernel's command line. | 264 | or async on the kernel's command line. |
265 | 265 | ||
266 | config SCSI_WAIT_SCAN | ||
267 | tristate # No prompt here, this is an invisible symbol. | ||
268 | default m | ||
269 | depends on SCSI | ||
270 | depends on MODULES | ||
271 | # scsi_wait_scan is a loadable module which waits until all the async scans are | ||
272 | # complete. The idea is to use it in initrd/ initramfs scripts. You modprobe | ||
273 | # it after all the modprobes of the root SCSI drivers and it will wait until | ||
274 | # they have all finished scanning their buses before allowing the boot to | ||
275 | # proceed. (This method is not applicable if targets boot independently in | ||
276 | # parallel with the initiator, or with transports with non-deterministic target | ||
277 | # discovery schemes, or if a transport driver does not support scsi_wait_scan.) | ||
278 | # | ||
279 | # This symbol is not exposed as a prompt because little is to be gained by | ||
280 | # disabling it, whereas people who accidentally switch it off may wonder why | ||
281 | # their mkinitrd gets into trouble. | ||
282 | |||
283 | menu "SCSI Transports" | 266 | menu "SCSI Transports" |
284 | depends on SCSI | 267 | depends on SCSI |
285 | 268 | ||
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 1a3368b08615..888f73a4aae1 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
@@ -159,8 +159,6 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/ | |||
159 | # This goes last, so that "real" scsi devices probe earlier | 159 | # This goes last, so that "real" scsi devices probe earlier |
160 | obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o | 160 | obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o |
161 | 161 | ||
162 | obj-$(CONFIG_SCSI_WAIT_SCAN) += scsi_wait_scan.o | ||
163 | |||
164 | scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ | 162 | scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ |
165 | scsicam.o scsi_error.o scsi_lib.o | 163 | scsicam.o scsi_error.o scsi_lib.o |
166 | scsi_mod-$(CONFIG_SCSI_DMA) += scsi_lib_dma.o | 164 | scsi_mod-$(CONFIG_SCSI_DMA) += scsi_lib_dma.o |
diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c deleted file mode 100644 index 072734538876..000000000000 --- a/drivers/scsi/scsi_wait_scan.c +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * scsi_wait_scan.c | ||
3 | * | ||
4 | * Copyright (C) 2006 James Bottomley <James.Bottomley@SteelEye.com> | ||
5 | * | ||
6 | * This is a simple module to wait until all the async scans are | ||
7 | * complete. The idea is to use it in initrd/initramfs scripts. You | ||
8 | * modprobe it after all the modprobes of the root SCSI drivers and it | ||
9 | * will wait until they have all finished scanning their busses before | ||
10 | * allowing the boot to proceed | ||
11 | */ | ||
12 | |||
13 | #include <linux/module.h> | ||
14 | #include <linux/device.h> | ||
15 | #include "scsi_priv.h" | ||
16 | |||
17 | static int __init wait_scan_init(void) | ||
18 | { | ||
19 | /* | ||
20 | * First we need to wait for device probing to finish; | ||
21 | * the drivers we just loaded might just still be probing | ||
22 | * and might not yet have reached the scsi async scanning | ||
23 | */ | ||
24 | wait_for_device_probe(); | ||
25 | return 0; | ||
26 | } | ||
27 | |||
28 | static void __exit wait_scan_exit(void) | ||
29 | { | ||
30 | } | ||
31 | |||
32 | MODULE_DESCRIPTION("SCSI wait for scans"); | ||
33 | MODULE_AUTHOR("James Bottomley"); | ||
34 | MODULE_LICENSE("GPL"); | ||
35 | |||
36 | late_initcall(wait_scan_init); | ||
37 | module_exit(wait_scan_exit); | ||