Consistently use types from linux/types.h to fix the following linux/target_core_user.h userspace compilation errors: /usr/include/linux/target_core_user.h:108:4: error: unknown type name 'uint32_t' uint32_t iov_cnt; /usr/include/linux/target_core_user.h:109:4: error: unknown type name 'uint32_t' uint32_t iov_bidi_cnt; /usr/include/linux/target_core_user.h:110:4: error: unknown type name 'uint32_t' uint32_t iov_dif_cnt; /usr/include/linux/target_core_user.h:111:4: error: unknown type name 'uint64_t' uint64_t cdb_off; /usr/include/linux/target_core_user.h:112:4: error: unknown type name 'uint64_t' uint64_t __pad1; /usr/include/linux/target_core_user.h:113:4: error: unknown type name 'uint64_t' uint64_t __pad2; /usr/include/linux/target_core_user.h:117:4: error: unknown type name 'uint8_t' uint8_t scsi_status; /usr/include/linux/target_core_user.h:118:4: error: unknown type name 'uint8_t' uint8_t __pad1; /usr/include/linux/target_core_user.h:119:4: error: unknown type name 'uint16_t' uint16_t __pad2; /usr/include/linux/target_core_user.h:120:4: error: unknown type name 'uint32_t' uint32_t __pad3;
Unified · Split
| @@ -105,26 +105,26 @@ struct tcmu_cmd_entry { · 104 unmodified lines | |||
| 105 | 105 | ||
| 106 | union { | 106 | union { |
| 107 | struct { | 107 | struct { |
| 108 | uint32_t iov_cnt; | 108 | __u32 iov_cnt; |
| 109 | uint32_t iov_bidi_cnt; | 109 | __u32 iov_bidi_cnt; |
| 110 | uint32_t iov_dif_cnt; | 110 | __u32 iov_dif_cnt; |
| 111 | uint64_t cdb_off; | 111 | __u64 cdb_off; |
| 112 | uint64_t __pad1; | 112 | __u64 __pad1; |
| 113 | uint64_t __pad2; | 113 | __u64 __pad2; |
| 114 | struct iovec iov[0]; | 114 | struct iovec iov[0]; |
| 115 | } req; | 115 | } req; |
| 116 | struct { | 116 | struct { |
| 117 | uint8_t scsi_status; | 117 | __u8 scsi_status; |
| 118 | uint8_t __pad1; | 118 | __u8 __pad1; |
| 119 | uint16_t __pad2; | 119 | __u16 __pad2; |
| 120 | uint32_t __pad3; | 120 | __u32 __pad3; |
| 121 | char sense_buffer[TCMU_SENSE_BUFFERSIZE]; | 121 | char sense_buffer[TCMU_SENSE_BUFFERSIZE]; |
| 122 | } rsp; | 122 | } rsp; |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| 125 | } __packed; | 125 | } __packed; |
| 126 | 126 | ||
| 127 | #define TCMU_OP_ALIGN_SIZE sizeof(uint64_t) | 127 | #define TCMU_OP_ALIGN_SIZE sizeof(__u64) |
| 128 | 128 | ||
| 129 | enum tcmu_genl_cmd { | 129 | enum tcmu_genl_cmd { |
| 130 | TCMU_CMD_UNSPEC, | 130 | TCMU_CMD_UNSPEC, |