>>>>> "Peter" == Peter Korsgaard <jacmet@xxxxxxxxxx> writes:
Peter> Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
Peter> in include/scsi to user space, but didn't change the uX types to the
Peter> userspace-compatible __uX types. Without that you'll get compile errors
Peter> when including them - E.G.:
Peter> /tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
Peter> before ‘u8’
Still no feedback?
Peter> Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Peter> ---
Peter> include/scsi/scsi.h | 8 ++++----
Peter> include/scsi/scsi_netlink.h | 20 ++++++++++----------
Peter> 2 files changed, 14 insertions(+), 14 deletions(-)
Peter> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
Peter> index 34c46ab..b3cffec 100644
Peter> --- a/include/scsi/scsi.h
Peter> +++ b/include/scsi/scsi.h
Peter> @@ -145,10 +145,10 @@ struct scsi_cmnd;
Peter> /* defined in T10 SCSI Primary Commands-2 (SPC2) */
Peter> struct scsi_varlen_cdb_hdr {
Peter> - u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
Peter> - u8 control;
Peter> - u8 misc[5];
Peter> - u8 additional_cdb_length; /* total cdb length - 8 */
Peter> + __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
Peter> + __u8 control;
Peter> + __u8 misc[5];
Peter> + __u8 additional_cdb_length; /* total cdb length - 8 */
Peter> __be16 service_action;
Peter> /* service specific data follows */
Peter> };
Peter> diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
Peter> index 536752c..7445c46 100644
Peter> --- a/include/scsi/scsi_netlink.h
Peter> +++ b/include/scsi/scsi_netlink.h
Peter> @@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
Peter> * PCI : ID data is the 16 bit PCI Registered Vendor ID
Peter> */
Peter> #define SCSI_NL_VID_TYPE_SHIFT 56
Peter> -#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
Peter> -#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
Peter> +#define SCSI_NL_VID_TYPE_MASK ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
Peter> +#define SCSI_NL_VID_TYPE_PCI ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
Peter> #define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)
Peter> @@ -125,21 +125,21 @@ struct scsi_nl_host_vendor_msg {
Peter> #include <scsi/scsi_host.h>
Peter> /* Exported Kernel Interfaces */
Peter> -int scsi_nl_add_transport(u8 tport,
Peter> +int scsi_nl_add_transport(__u8 tport,
Peter> int (*msg_handler)(struct sk_buff *),
Peter> void (*event_handler)(struct notifier_block *, unsigned long, void *));
Peter> -void scsi_nl_remove_transport(u8 tport);
Peter> +void scsi_nl_remove_transport(__u8 tport);
Peter> -int scsi_nl_add_driver(u64 vendor_id, struct scsi_host_template *hostt,
Peter> +int scsi_nl_add_driver(__u64 vendor_id, struct scsi_host_template *hostt,
Peter> int (*nlmsg_handler)(struct Scsi_Host *shost, void *payload,
Peter> - u32 len, u32 pid),
Peter> + __u32 len, __u32 pid),
Peter> void (*nlevt_handler)(struct notifier_block *nb,
Peter> unsigned long event, void *notify_ptr));
Peter> -void scsi_nl_remove_driver(u64 vendor_id);
Peter> +void scsi_nl_remove_driver(__u64 vendor_id);
Peter> -void scsi_nl_send_transport_msg(u32 pid, struct scsi_nl_hdr *hdr);
Peter> -int scsi_nl_send_vendor_msg(u32 pid, unsigned short host_no, u64 vendor_id,
Peter> - char *data_buf, u32 data_len);
Peter> +void scsi_nl_send_transport_msg(__u32 pid, struct scsi_nl_hdr *hdr);
Peter> +int scsi_nl_send_vendor_msg(__u32 pid, unsigned short host_no, __u64 vendor_id,
Peter> + char *data_buf, __u32 data_len);
Peter> #endif /* __KERNEL__ */
Peter> --
Peter> 1.6.5
--
Bye, Peter Korsgaard
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
