From: James Bottomley Date: Sun, 8 Feb 2009 21:59:48 -0600 Subject: [PATCH] [SCSI] Make scsi.h independent of the rest of the scsi includes This allows it to compile and be used on the ps3 platform that wants to use the #define values in scsi.h without actually having CONFIG_SCSI set. Signed-off-by: James Bottomley --- block/cmd-filter.c | 1 + include/scsi/scsi.h | 19 ++----------------- include/scsi/scsi_cmnd.h | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git linux-2.6.28/block/cmd-filter.c linux-2.6.28/block/cmd-filter.c index 504b275..572bbc2 100644 --- linux-2.6.28/block/cmd-filter.c +++ linux-2.6.28/block/cmd-filter.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git linux-2.6.28/include/scsi/scsi.h linux-2.6.28/include/scsi/scsi.h index 80d7f60..084478e 100644 --- linux-2.6.28/include/scsi/scsi.h +++ linux-2.6.28/include/scsi/scsi.h @@ -9,7 +9,6 @@ #define _SCSI_SCSI_H #include -#include /* * The maximum number of SG segments that we will put inside a @@ -449,22 +448,6 @@ #define driver_byte(result) (((result) >> 24) & 0xff) #define suggestion(result) (driver_byte(result) & SUGGEST_MASK) -static inline void set_msg_byte(struct scsi_cmnd *cmd, char status) -{ - cmd->result |= status << 8; -} - -static inline void set_host_byte(struct scsi_cmnd *cmd, char status) -{ - cmd->result |= status << 16; -} - -static inline void set_driver_byte(struct scsi_cmnd *cmd, char status) -{ - cmd->result |= status << 24; -} - - #define sense_class(sense) (((sense) >> 4) & 0x7) #define sense_error(sense) ((sense) & 0xf) #define sense_valid(sense) ((sense) & 0x80); diff --git linux-2.6.28/include/scsi/scsi_cmnd.h linux-2.6.28/include/scsi/scsi_cmnd.h index 855bf95..43b50d3 100644 --- linux-2.6.28/include/scsi/scsi_cmnd.h +++ linux-2.6.28/include/scsi/scsi_cmnd.h @@ -291,4 +291,19 @@ #define scsi_for_each_prot_sg(cmd, sg, nseg, __i) \ for_each_sg(scsi_prot_sglist(cmd), sg, nseg, __i) +static inline void set_msg_byte(struct scsi_cmnd *cmd, char status) +{ + cmd->result |= status << 8; +} + +static inline void set_host_byte(struct scsi_cmnd *cmd, char status) +{ + cmd->result |= status << 16; +} + +static inline void set_driver_byte(struct scsi_cmnd *cmd, char status) +{ + cmd->result |= status << 24; +} + #endif /* _SCSI_SCSI_CMND_H */ From: Peter Korsgaard Date: Tue, 10 Aug 2010 18:01:24 -0700 Subject: [PATCH] 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 Cc: Boaz Harrosh Cc: James Smart Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/scsi/scsi.h | 8 ++++---- include/scsi/scsi_netlink.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git linux-2.6.28/include/scsi/scsi.h linux-2.6.28/include/scsi/scsi.h index 9ae5c61..8fcb6e0 100644 --- linux-2.6.28/include/scsi/scsi.h +++ linux-2.6.28/include/scsi/scsi.h @@ -140,10 +140,10 @@ /* defined in T10 SCSI Primary Commands-2 (SPC2) */ struct scsi_varlen_cdb_hdr { - u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ - u8 control; - u8 misc[5]; - u8 additional_cdb_length; /* total cdb length - 8 */ + __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ + __u8 control; + __u8 misc[5]; + __u8 additional_cdb_length; /* total cdb length - 8 */ __be16 service_action; /* service specific data follows */ }; diff --git linux-2.6.28/include/scsi/scsi_netlink.h linux-2.6.28/include/scsi/scsi_netlink.h index 536752c..58ce8fe 100644 --- linux-2.6.28/include/scsi/scsi_netlink.h +++ linux-2.6.28/include/scsi/scsi_netlink.h @@ -105,8 +105,8 @@ * PCI : ID data is the 16 bit PCI Registered Vendor ID */ #define SCSI_NL_VID_TYPE_SHIFT 56 -#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT) -#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT) +#define SCSI_NL_VID_TYPE_MASK ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT) +#define SCSI_NL_VID_TYPE_PCI ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT) #define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)