Add some spare fields to structs used by the new iSCSI stack - some just

in case, some for future MC/S support.

This requires kernel and world rebuild.

Approved by:	re (blanket)
Sponsored by:	FreeBSD Foundation

2 files changed, 23 insertions, 0 deletions

diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h
index e9b0181..f869edf 100644
--- a/sys/cam/ctl/ctl_ioctl.h
+++ b/sys/cam/ctl/ctl_ioctl.h
@@ -662,12 +662,14 @@ struct ctl_iscsi_handoff_params {
 	uint32_t		max_burst_length;
 	uint32_t		first_burst_length;
 	uint32_t		immediate_data;
+	int			spare[4];
 };
 
 struct ctl_iscsi_list_params {
 	uint32_t		alloc_len;	/* passed to kernel */
 	char                   *conn_xml;	/* filled in kernel */
 	uint32_t		fill_len;	/* passed to userland */
+	int			spare[4];
 };
 
 struct ctl_iscsi_logout_params {
@@ -677,6 +679,7 @@ struct ctl_iscsi_logout_params {
 	char			initiator_addr[CTL_ISCSI_ADDR_LEN];
 						/* passed to kernel */
 	int			all;		/* passed to kernel */
+	int			spare[4];
 };
 
 struct ctl_iscsi_terminate_params {
@@ -686,6 +689,7 @@ struct ctl_iscsi_terminate_params {
 	char			initiator_addr[CTL_ISCSI_NAME_LEN];
 						/* passed to kernel */
 	int			all;		/* passed to kernel */
+	int			spare[4];
 };
 
 #ifdef ICL_KERNEL_PROXY
@@ -696,10 +700,12 @@ struct ctl_iscsi_listen_params {
 	int				protocol;
 	struct sockaddr			*addr;
 	socklen_t			addrlen;
+	int				spare[4];
 };
 
 struct ctl_iscsi_accept_params {
 	int				connection_id;
+	int				spare[4];
 };
 
 struct ctl_iscsi_send_params {
@@ -709,6 +715,7 @@ struct ctl_iscsi_send_params {
 	void				*spare2;
 	size_t				data_segment_len;
 	void				*data_segment;
+	int				spare[4];
 };
 
 struct ctl_iscsi_receive_params {
@@ -718,10 +725,12 @@ struct ctl_iscsi_receive_params {
 	void				*spare2;
 	size_t				data_segment_len;
 	void				*data_segment;
+	int				spare[4];
 };
 
 struct ctl_iscsi_close_params {
 	int				connection_id;
+	int				spare[4];
 };
 #endif /* ICL_KERNEL_PROXY */
 
diff --git a/sys/dev/iscsi/iscsi_ioctl.h b/sys/dev/iscsi/iscsi_ioctl.h
index 61c48cc..f5888c2 100644
--- a/sys/dev/iscsi/iscsi_ioctl.h
+++ b/sys/dev/iscsi/iscsi_ioctl.h
@@ -91,6 +91,9 @@ struct iscsi_session_state {
 struct iscsi_daemon_request {
 	unsigned int			idr_session_id;
 	struct iscsi_session_conf	idr_conf;
+	uint8_t				idr_spare_isid[6];
+	uint16_t			idr_spare_tsih;
+	uint16_t			idr_spare_cid;
 	int				idr_spare[4];
 };
 
@@ -99,6 +102,8 @@ struct iscsi_daemon_handoff {
 	int				idh_socket;
 	char				idh_target_alias[ISCSI_ALIAS_LEN];
 	uint8_t				idh_isid[6];
+	uint16_t			idr_spare_tsih;
+	uint16_t			idr_spare_cid;
 	uint32_t			idh_statsn;
 	int				idh_header_digest;
 	int				idh_data_digest;
@@ -107,11 +112,13 @@ struct iscsi_daemon_handoff {
 	size_t				idh_max_data_segment_length;
 	size_t				idh_max_burst_length;
 	size_t				idh_first_burst_length;
+	int				idh_spare[4];
 };
 
 struct iscsi_daemon_fail {
 	unsigned int			idf_session_id;
 	char				idf_reason[ISCSI_REASON_LEN];
+	int				idf_spare[4];
 };
 
 #define	ISCSIDWAIT	_IOR('I', 0x01, struct iscsi_daemon_request)
@@ -145,6 +152,7 @@ struct iscsi_daemon_connect {
 	socklen_t			idc_from_addrlen;
 	struct sockaddr			*idc_to_addr;
 	socklen_t			idc_to_addrlen;
+	int				idc_spare[4];
 };
 
 struct iscsi_daemon_send {
@@ -154,6 +162,7 @@ struct iscsi_daemon_send {
 	void				*ids_spare2;
 	size_t				ids_data_segment_len;
 	void				*ids_data_segment;
+	int				ids_spare[4];
 };
 
 struct iscsi_daemon_receive {
@@ -163,10 +172,12 @@ struct iscsi_daemon_receive {
 	void				*idr_spare2;
 	size_t				idr_data_segment_len;
 	void				*idr_data_segment;
+	int				idr_spare[4];
 };
 
 struct iscsi_daemon_close {
 	int				idc_session_id;
+	int				idc_spare[4];
 };
 
 #define	ISCSIDCONNECT	_IOWR('I', 0x04, struct iscsi_daemon_connect)
@@ -182,16 +193,19 @@ struct iscsi_daemon_close {
 
 struct iscsi_session_add {
 	struct iscsi_session_conf	isa_conf;
+	int				isa_spare[4];
 };
 
 struct iscsi_session_remove {
 	unsigned int			isr_session_id;
 	struct iscsi_session_conf	isr_conf;
+	int				isr_spare[4];
 };
 
 struct iscsi_session_list {
 	unsigned int			isl_nentries;
 	struct iscsi_session_state	*isl_pstates;
+	int				isl_spare[4];
 };
 
 #define	ISCSISADD	_IOW('I', 0x11, struct iscsi_session_add)