diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-10 21:01:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 11:59:01 -0400 |
commit | 083c8c1e60e5c27a277e87dbeb6b89b47937559f (patch) | |
tree | 2db64254a4a112be805fa3b5576862fd3465bbaa /include/scsi/scsi.h | |
parent | 6de61f9d2491970a204da9111e2d25e0d9f284d6 (diff) |
scsi: use __uX types for headers exported to user space
Commit 9e4f5e29 ("FC Pass Thru support") exported a number of header files
in include/scsi to user space, but didn't change the uX types to the
userspace-compatible __uX types. Without that you'll get compile errors
when including them - E.G.:
include/scsi/scsi.h:145: error: expected specifier-qualifier-list before `u8'
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Boaz Harrosh <bharrosh@panasas.com>
Cc: James Smart <james.smart@emulex.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/scsi/scsi.h')
-rw-r--r-- | include/scsi/scsi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 9ae5c613131b..8fcb6e0e9e72 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h | |||
@@ -151,10 +151,10 @@ struct scsi_cmnd; | |||
151 | 151 | ||
152 | /* defined in T10 SCSI Primary Commands-2 (SPC2) */ | 152 | /* defined in T10 SCSI Primary Commands-2 (SPC2) */ |
153 | struct scsi_varlen_cdb_hdr { | 153 | struct scsi_varlen_cdb_hdr { |
154 | u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ | 154 | __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ |
155 | u8 control; | 155 | __u8 control; |
156 | u8 misc[5]; | 156 | __u8 misc[5]; |
157 | u8 additional_cdb_length; /* total cdb length - 8 */ | 157 | __u8 additional_cdb_length; /* total cdb length - 8 */ |
158 | __be16 service_action; | 158 | __be16 service_action; |
159 | /* service specific data follows */ | 159 | /* service specific data follows */ |
160 | }; | 160 | }; |