scsi: use __uX types for headers exported to user space
PATCH 22/26 scsi: use __uX types for headers exported to user space
From: Peter Korsgaard <[email protected]>
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 <[email protected]>
Cc Boaz Harrosh <[email protected]>
Cc James Smart <[email protected]>
Cc James Bottomley <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/scsi/scsi.h | 8 ++++---- include/scsi/scsi_netlink.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
include/scsi/scsi.h renamed from include/scsi/scsi.h~scsi-use-__ux-types-for-headers-exported-to-user-space +4 -4
@@ -151,10 +151,10 @@ struct scsi_cmnd;/* 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 */ };
include/scsi/scsi_netlink.h renamed from include/scsi/scsi_netlink.h~scsi-use-__ux-types-for-headers-exported-to-user-space +2 -2
@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {* 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)
_