Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6072609d authored by James Bottomley's avatar James Bottomley
Browse files

[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

c7510859
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: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 4e5fae7a

drivers/scsi/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -263,23 +263,6 @@ config SCSI_SCAN_ASYNC 
	  You can override this choice by specifying "scsi_mod.scan=sync"

	  or async on the kernel's command line.



config SCSI_WAIT_SCAN

	tristate  # No prompt here, this is an invisible symbol.

	default m

	depends on SCSI

	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.



menu "SCSI Transports"

	depends on SCSI

drivers/scsi/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/ 
# This goes last, so that "real" scsi devices probe earlier

obj-$(CONFIG_SCSI_DEBUG)	+= scsi_debug.o



obj-$(CONFIG_SCSI_WAIT_SCAN)	+= scsi_wait_scan.o



scsi_mod-y			+= scsi.o hosts.o scsi_ioctl.o constants.o \

				   scsicam.o scsi_error.o scsi_lib.o

scsi_mod-$(CONFIG_SCSI_DMA)	+= scsi_lib_dma.o

drivers/scsi/scsi_wait_scan.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * scsi_wait_scan.c

 *

 * Copyright (C) 2006 James Bottomley <James.Bottomley@SteelEye.com>

 *

 * This is a simple module to wait 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 busses before

 * allowing the boot to proceed

 */



#include <linux/module.h>

#include <linux/device.h>

#include "scsi_priv.h"



static int __init wait_scan_init(void)

{

	/*

	 * First we need to wait for device probing to finish;

	 * the drivers we just loaded might just still be probing

	 * and might not yet have reached the scsi async scanning

	 */

	wait_for_device_probe();

	return 0;

}



static void __exit wait_scan_exit(void)

{

}



MODULE_DESCRIPTION("SCSI wait for scans");

MODULE_AUTHOR("James Bottomley");

MODULE_LICENSE("GPL");



late_initcall(wait_scan_init);

module_exit(wait_scan_exit);