releases/3.4.2/scsi-fix-scsi_wait_scan.patch

   1 From 1ff2f40305772b159a91c19590ee159d3a504afc Mon Sep 17 00:00:00 2001
   2 From: James Bottomley <jbottomley@parallels.com>
   3 Date: Wed, 30 May 2012 09:45:39 +0000
   4 Subject: SCSI: fix scsi_wait_scan
   5
   6 From: James Bottomley <jbottomley@parallels.com>
   7
   8 commit 1ff2f40305772b159a91c19590ee159d3a504afc upstream.
   9
  10 Commit  c751085943362143f84346d274e0011419c84202
  11 Author: Rafael J. Wysocki <rjw@sisk.pl>
  12 Date:   Sun Apr 12 20:06:56 2009 +0200
  13
  14     PM/Hibernate: Wait for SCSI devices scan to complete during resume
  15
  16 Broke the scsi_wait_scan module in 2.6.30.  Apparently debian still uses it so
  17 fix it and backport to stable before removing it in 3.6.
  18
  19 The breakage is caused because the function template in
  20 include/scsi/scsi_scan.h is defined to be a nop unless SCSI is built in.
  21 That means that in the modular case (which is every distro), the
  22 scsi_wait_scan module does a simple async_synchronize_full() instead of
  23 waiting for scans.
  24
  25 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  26 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27
  28 ---
  29  drivers/scsi/scsi_wait_scan.c |    2 +-
  30  1 file changed, 1 insertion(+), 1 deletion(-)
  31
  32 --- a/drivers/scsi/scsi_wait_scan.c
  33 +++ b/drivers/scsi/scsi_wait_scan.c
  34 @@ -12,7 +12,7 @@
  35
  36  #include <linux/module.h>
  37  #include <linux/device.h>
  38 -#include <scsi/scsi_scan.h>
  39 +#include "scsi_priv.h"
  40
  41  static int __init wait_scan_init(void)
  42  {