lkml.org 
[lkml]   [2012]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [ 089/180] SCSI: fix scsi_wait_scan
On Thu, Oct 04, 2012 at 09:34:36PM +0100, Ben Hutchings wrote:
> On Tue, Oct 02, 2012 at 12:53:26AM +0200, Willy Tarreau wrote:
> > 2.6.32-longterm review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: James Bottomley <jbottomley@parallels.com>
> >
> > 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.
> [...]
> > --- a/drivers/scsi/scsi_wait_scan.c
> > +++ b/drivers/scsi/scsi_wait_scan.c
> > @@ -13,6 +13,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)
> > {
>
> This backported version is a no-op. I think we need to do:
>
> -#include <scsi/scsi_scan.h>
> +
> +extern int scsi_complete_async_scans(void);

But this is what we have in scsi_scan.h :

#ifdef CONFIG_SCSI
/* drivers/scsi/scsi_scan.c */
extern int scsi_complete_async_scans(void);
#else
static inline int scsi_complete_async_scans(void) { return 0; }
#endif

Since CONFIG_SCSI_WAIT_SCAN depends on CONFIG_SCSI, we're certain to have
it defined when we build this code.

Am I missing something ?

Regards,
Willy



\
 
 \ /
  Last update: 2012-10-04 23:41    [W:0.144 / U:2.848 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site