svn commit: r301723 - head/sys/dev/iscsi

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Jun  9 11:39:50 2016
New Revision: 301723
URL: https://svnweb.freebsd.org/changeset/base/301723

Log:
  Add some spares to structs used by iscsi(4), to avoid ABI problems
  during 11-STABLE.
  
  MFC after:	1 month

Modified:
  head/sys/dev/iscsi/iscsi_ioctl.h

Modified: head/sys/dev/iscsi/iscsi_ioctl.h
==============================================================================
--- head/sys/dev/iscsi/iscsi_ioctl.h	Thu Jun  9 08:19:42 2016	(r301722)
+++ head/sys/dev/iscsi/iscsi_ioctl.h	Thu Jun  9 11:39:50 2016	(r301723)
@@ -68,7 +68,7 @@ struct iscsi_session_conf {
 	int		isc_iser;
 	char		isc_offload[ISCSI_OFFLOAD_LEN];
 	int		isc_enable;
-	int		isc_spare[1];
+	int		isc_spare[4];
 };
 
 /*
@@ -77,6 +77,7 @@ struct iscsi_session_conf {
  */
 struct iscsi_session_limits {
 	size_t		isl_max_data_segment_length;
+	int		isl_spare[8];
 };
 
 /*
@@ -89,12 +90,13 @@ struct iscsi_session_state {
 	int		iss_header_digest;
 	int		iss_data_digest;
 	int		iss_max_data_segment_length;
+	int		iss_max_burst_length;
+	int		iss_first_burst_length;
 	int		iss_immediate_data;
 	int		iss_connected;
 	char		iss_reason[ISCSI_REASON_LEN];
 	char		iss_offload[ISCSI_OFFLOAD_LEN];
-	int		iss_max_burst_length;
-	int		iss_first_burst_length;
+	int		iss_spare[4];
 };
 
 /*
@@ -107,7 +109,7 @@ struct iscsi_daemon_request {
 	uint16_t			idr_tsih;
 	uint16_t			idr_spare_cid;
 	struct iscsi_session_limits	idr_limits;
-	int				idr_spare[2];
+	int				idr_spare[4];
 };
 
 struct iscsi_daemon_handoff {
@@ -120,11 +122,11 @@ struct iscsi_daemon_handoff {
 	uint32_t			idh_statsn;
 	int				idh_header_digest;
 	int				idh_data_digest;
-	int				idh_initial_r2t;
-	int				idh_immediate_data;
 	size_t				idh_max_data_segment_length;
 	size_t				idh_max_burst_length;
 	size_t				idh_first_burst_length;
+	int				idh_immediate_data;
+	int				idh_initial_r2t;
 	int				idh_spare[4];
 };