uapi: fix linux/target_core_user.h userspace compilation errors
PATCH 1/1 uapi: fix linux/target_core_user.h userspace compilation errors
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;Signed-off-by Dmitry V. Levin <[email protected]>
--- include/uapi/linux/target_core_user.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
include/uapi/linux/target_core_user.h +11 -11
@@ -105,26 +105,26 @@ struct tcmu_cmd_entry {union {struct { -uint32_t iov_cnt; -uint32_t iov_bidi_cnt; -uint32_t iov_dif_cnt; -uint64_t cdb_off; -uint64_t __pad1; -uint64_t __pad2; +__u32 iov_cnt; +__u32 iov_bidi_cnt; +__u32 iov_dif_cnt; +__u64 cdb_off; +__u64 __pad1; +__u64 __pad2;struct iovec iov[0 ]; } req;struct { -uint8_t scsi_status; -uint8_t __pad1; -uint16_t __pad2; -uint32_t __pad3; +__u8 scsi_status; +__u8 __pad1; +__u16 __pad2; +__u32 __pad3;char sense_buffer[TCMU_SENSE_BUFFERSIZE ]; } rsp; }; } __packed; -#define TCMU_OP_ALIGN_SIZE sizeof(uint64_t) +#define TCMU_OP_ALIGN_SIZE sizeof(__u64)enum tcmu_genl_cmd {TCMU_CMD_UNSPEC ,
Signature · 1 line
ldv
Nicholas A. Bellinger
AppliedHi Dmitry,
Quoted 24 lines · Dmitry V. Levin
Consistently use types from
linux/types.hto fix the followinglinux/target_core_user.huserspace 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;
Quoted 4 lines
Signed-off-by Dmitry V. Levin <[email protected]>--- include/uapi/linux/target_core_user.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
Applied to target-pending/for-next.
Thank you.