Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762b6f00 authored by Dmitry V. Levin's avatar Dmitry V. Levin Committed by Nicholas Bellinger
Browse files

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: default avatarDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 0ab8ac6f

include/uapi/linux/target_core_user.h

+11 −11
Original line number Original line Diff line number Diff line
@@ -105,26 +105,26 @@ struct tcmu_cmd_entry { 




	union {

	union {

		struct {

		struct {

			uint32_t iov_cnt;

			__u32 iov_cnt;

			uint32_t iov_bidi_cnt;

			__u32 iov_bidi_cnt;

			uint32_t iov_dif_cnt;

			__u32 iov_dif_cnt;

			uint64_t cdb_off;

			__u64 cdb_off;

			uint64_t __pad1;

			__u64 __pad1;

			uint64_t __pad2;

			__u64 __pad2;

			struct iovec iov[0];

			struct iovec iov[0];

		} req;

		} req;

		struct {

		struct {

			uint8_t scsi_status;

			__u8 scsi_status;

			uint8_t __pad1;

			__u8 __pad1;

			uint16_t __pad2;

			__u16 __pad2;

			uint32_t __pad3;

			__u32 __pad3;

			char sense_buffer[TCMU_SENSE_BUFFERSIZE];

			char sense_buffer[TCMU_SENSE_BUFFERSIZE];

		} rsp;

		} rsp;

	};

	};





} __packed;

} __packed;





#define TCMU_OP_ALIGN_SIZE sizeof(uint64_t)

#define TCMU_OP_ALIGN_SIZE sizeof(__u64)





enum tcmu_genl_cmd {

enum tcmu_genl_cmd {

	TCMU_CMD_UNSPEC,

	TCMU_CMD_UNSPEC,