fix scsi_wait_scan
authorJames Bottomley <jbottomley@parallels.com>
Wed, 30 May 2012 09:45:39 +0000 (09:45 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 10 Jun 2012 13:41:47 +0000 (14:41 +0100)
commitfd680782af2f335685fb30c87b52fbebf3d224e7
treeacd384ea22431c76a39988e80cfb4b394a42e7c3
parent39083c6db7e18732e872fed0c2f2427de12a622a
fix scsi_wait_scan

commit 1ff2f40305772b159a91c19590ee159d3a504afc upstream.

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

Broke the scsi_wait_scan module in 2.6.30.  Apparently debian still uses it so
fix it and backport to stable before removing it in 3.6.

The breakage is caused because the function template in
include/scsi/scsi_scan.h is defined to be a nop unless SCSI is built in.
That means that in the modular case (which is every distro), the
scsi_wait_scan module does a simple async_synchronize_full() instead of
waiting for scans.

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/scsi/scsi_wait_scan.c