[lkml]   [2012]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[ 33/82] [SCSI] fix scsi_wait_scan
    3.2-stable review patch.  If anyone has any objections, please let me know.


    From: James Bottomley <>

    commit 1ff2f40305772b159a91c19590ee159d3a504afc upstream.

    Commit c751085943362143f84346d274e0011419c84202
    Author: Rafael J. Wysocki <>
    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 <>
    Signed-off-by: Ben Hutchings <>
    drivers/scsi/scsi_wait_scan.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c
    index 74708fc..ae78148 100644
    --- a/drivers/scsi/scsi_wait_scan.c
    +++ b/drivers/scsi/scsi_wait_scan.c
    @@ -12,7 +12,7 @@

    #include <linux/module.h>
    #include <linux/device.h>
    -#include <scsi/scsi_scan.h>
    +#include "scsi_priv.h"

    static int __init wait_scan_init(void)

     \ /
      Last update: 2012-06-08 07:42    [W:0.023 / U:3.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site