[patch 2/7] git scsi misc include fix

[patch 2/7] git scsi misc include fix

[akpm]

From: Paul Jackson <pj@sgi.com>

The added line in scsi_eh.h:
	struct scatterlist sense_sgl;
fails to compile, with the error:
	field 'sense_sgl' has incomplete type
unless scatterlist.h happens to be included
somehow already ... which it isn't always.

So include scatterlist.h in scsi_eh.h directly.

Signed-off-by: Paul Jackson <pj@sgi.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/scsi/scsi_eh.h |    1 +
 1 file changed, 1 insertion(+)

diff -puN include/scsi/scsi_eh.h~git-scsi-misc-include-fix include/scsi/scsi_eh.h
--- a/include/scsi/scsi_eh.h~git-scsi-misc-include-fix
+++ a/include/scsi/scsi_eh.h
@@ -4,6 +4,7 @@
 #include <linux/scatterlist.h>
 
 #include <scsi/scsi_cmnd.h>
+#include <linux/scatterlist.h>
 struct scsi_device;
 struct Scsi_Host;
 
_

Re: [patch 2/7] git scsi misc include fix

[Randy Dunlap]

On Tue, 16 Oct 2007 14:28:20 -0700 akpm@linux-foundation.org wrote:

> From: Paul Jackson <pj@sgi.com>
> 
> The added line in scsi_eh.h:
> 	struct scatterlist sense_sgl;
> fails to compile, with the error:
> 	field 'sense_sgl' has incomplete type
> unless scatterlist.h happens to be included
> somehow already ... which it isn't always.
> 
> So include scatterlist.h in scsi_eh.h directly.
> 
> Signed-off-by: Paul Jackson <pj@sgi.com>
> Cc: James Bottomley <James.Bottomley@steeleye.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  include/scsi/scsi_eh.h |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff -puN include/scsi/scsi_eh.h~git-scsi-misc-include-fix include/scsi/scsi_eh.h
> --- a/include/scsi/scsi_eh.h~git-scsi-misc-include-fix
> +++ a/include/scsi/scsi_eh.h
> @@ -4,6 +4,7 @@
>  #include <linux/scatterlist.h>
>  
>  #include <scsi/scsi_cmnd.h>
> +#include <linux/scatterlist.h>
>  struct scsi_device;
>  struct Scsi_Host;

It's 3 lines above the patch line....


---
~Randy

Re: [patch 2/7] git scsi misc include fix

[Paul Jackson]

Randy wrote:
> >  #include <linux/scatterlist.h>
> >  
> >  #include <scsi/scsi_cmnd.h>
> > +#include <linux/scatterlist.h>
> >  struct scsi_device;
> >  struct Scsi_Host;
> 
> It's 3 lines above the patch line....

Ah - you mean scatterlist.h is now included twice - yup.

First I noticed that scsi_eh.h needed this scatterlist.h include and
sent this patch to akpm.  Then James noticed that my patch just added
scatterlist.h to scsi_eh.h, without removing it from the other .c file
where it was no longer needed, so he sent along a patch that did both -
removing the one include and adding the other.  His patch added the
first scatterlist.h include above, and my earlier patch added the
second.

Now we have both scatterlist.h includes here.

I guess I'll leave it up to James to send along a third patch someday,
that removes one of these includes.

Sharp eyes, Randy - thanks.

-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@sgi.com> 1.925.600.0401