[PATCH] Fix scsi/scsi_transport.h compile error

[PATCH] Fix scsi/scsi_transport.h compile error

[Rolf Eike Beer]

scsi_transport.h defines the inline function scsi_transport_device_data()
that dereferences a pointer of "struct scsi_device *". Since the struct is
not known by the header this might break compilation.

Include scsi/scsi_device.h to not rely on users doing the correct magic
include order.

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>

---
commit 2ce61cfef5642b3a7414d2f430acf179f50f7228
tree 4d9c48a499dd47028bf28dfdd931c501efc32db3
parent 788fd16e408ca6c1008829d52bca9f13cbec64ce
author Rolf Eike Beer <eike-kernel@sf-tec.de> Mon, 31 Jul 2006 09:08:09 +0200
committer Rolf Eike Beer <beer@siso-eb-i34d.silicon-software.de> Mon, 31 Jul 2006 09:08:09 +0200

 include/scsi/scsi_transport.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index cca1d49..3c18baa 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -22,6 +22,7 @@ #define SCSI_TRANSPORT_H
 
 #include <linux/transport_class.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
 
 struct scsi_transport_template {
 	/* the attribute containers */

Re: [PATCH] Fix scsi/scsi_transport.h compile error

[Kyle McMartin]

On Mon, Jul 31, 2006 at 09:43:25AM +0200, Rolf Eike Beer wrote:
> scsi_transport.h defines the inline function scsi_transport_device_data()
> that dereferences a pointer of "struct scsi_device *". Since the struct is
> not known by the header this might break compilation.

This should be solved with a "struct scsi_device;" decl, instead of
Yet More Header Dependancies...

--Kyle

Re: [PATCH] Fix scsi/scsi_transport.h compile error

[Stefan Richter]

On 7/31/2006 3:14 PM, Kyle McMartin wrote:
> On Mon, Jul 31, 2006 at 09:43:25AM +0200, Rolf Eike Beer wrote:
>> scsi_transport.h defines the inline function scsi_transport_device_data()
>> that dereferences a pointer of "struct scsi_device *". Since the struct is
>> not known by the header this might break compilation.
> 
> This should be solved with a "struct scsi_device;" decl, instead of
> Yet More Header Dependancies...

That function accesses members of the struct, i.e. the compiler needs to
know offsets into struct scsi_device at this point. Therefore it needs
the definition, not a declaration.
-- 
Stefan Richter
-=====-=-==- -=== ==---
http://arcgraph.de/sr/

Re: [PATCH] Fix scsi/scsi_transport.h compile error

[Kyle McMartin]

On Mon, Jul 31, 2006 at 03:37:46PM +0200, Stefan Richter wrote:
> > This should be solved with a "struct scsi_device;" decl, instead of
> > Yet More Header Dependancies...
> 
> That function accesses members of the struct, i.e. the compiler needs to
> know offsets into struct scsi_device at this point. Therefore it needs
> the definition, not a declaration.

Odd, ISTR that it only needed to be defined at the point the inline was
used. Oh well, my bad.

--Kyle

Re: [PATCH] Fix scsi/scsi_transport.h compile error

[Stefan Richter]

Kyle McMartin wrote:
> On Mon, Jul 31, 2006 at 03:37:46PM +0200, Stefan Richter wrote:
>> That function accesses members of the struct, i.e. the compiler needs to
>> know offsets into struct scsi_device at this point. Therefore it needs
>> the definition, not a declaration.
> 
> Odd, ISTR that it only needed to be defined at the point the inline was
> used. Oh well, my bad.

One would think so. Maybe it depends on the compiler version.

(Actually I haven't checked scsi_transport.h myself but I recall fixing
another header with the same issue. Although I don't remember anymore
whether it lead to a warning or to an error and which gcc version I used
then.)
-- 
Stefan Richter
-=====-=-==- -=== ==---
http://arcgraph.de/sr/

Re: [PATCH] Fix scsi/scsi_transport.h compile error

[Rolf Eike Beer]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Am Montag, 31. Juli 2006 16:38 schrieb Kyle McMartin:
> On Mon, Jul 31, 2006 at 03:37:46PM +0200, Stefan Richter wrote:
> > > This should be solved with a "struct scsi_device;" decl, instead of
> > > Yet More Header Dependancies...
> >
> > That function accesses members of the struct, i.e. the compiler needs to
> > know offsets into struct scsi_device at this point. Therefore it needs
> > the definition, not a declaration.
>
> Odd, ISTR that it only needed to be defined at the point the inline was
> used. Oh well, my bad.

That would be expected behaviour on a define.

Eike

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]