Merge tag 'for-linus-5.7-1' of git://github.com/cminyard/linux-ipmi

[linux-block.git] / include / scsi / iscsi_if.h

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 92b11c7e0b4f22ecdaad25bf5d66e2ae7fc61a22..5225a23f2d0e6ea9b931b444b5c0e6695ed24794 100644 (file)
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -60,6 +60,7 @@ enum iscsi_uevent_e {
        ISCSI_UEVENT_LOGOUT_FLASHNODE_SID       = UEVENT_BASE + 30,
        ISCSI_UEVENT_SET_CHAP           = UEVENT_BASE + 31,
        ISCSI_UEVENT_GET_HOST_STATS     = UEVENT_BASE + 32,
+       ISCSI_UEVENT_DESTROY_SESSION_ASYNC      = UEVENT_BASE + 33,
 
        /* up events */
        ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
@@ -311,7 +312,7 @@ enum iscsi_param_type {
 struct iscsi_param_info {
        uint32_t len;           /* Actual length of the param value */
        uint16_t param;         /* iscsi param */
-       uint8_t value[0];       /* length sized value follows */
+       uint8_t value[];        /* length sized value follows */
 } __packed;
 
 struct iscsi_iface_param_info {
@@ -320,7 +321,7 @@ struct iscsi_iface_param_info {
        uint16_t param;         /* iscsi param value */
        uint8_t iface_type;     /* IPv4 or IPv6 */
        uint8_t param_type;     /* iscsi_param_type */
-       uint8_t value[0];       /* length sized value follows */
+       uint8_t value[];        /* length sized value follows */
 } __packed;
 
 /*
@@ -697,7 +698,7 @@ enum iscsi_flashnode_param {
 struct iscsi_flashnode_param_info {
        uint32_t len;           /* Actual length of the param */
        uint16_t param;         /* iscsi param value */
-       uint8_t value[0];       /* length sized value follows */
+       uint8_t value[];        /* length sized value follows */
 } __packed;
 
 enum iscsi_discovery_parent_type {
@@ -815,7 +816,7 @@ struct iscsi_stats {
         * up to ISCSI_STATS_CUSTOM_MAX
         */
        uint32_t custom_length;
-       struct iscsi_stats_custom custom[0]
+       struct iscsi_stats_custom custom[]
                __attribute__ ((aligned (sizeof(uint64_t))));
 };
 
@@ -946,7 +947,7 @@ struct iscsi_offload_host_stats {
         * up to ISCSI_HOST_STATS_CUSTOM_MAX
         */
        uint32_t custom_length;
-       struct iscsi_host_stats_custom custom[0]
+       struct iscsi_host_stats_custom custom[]
                __aligned(sizeof(uint64_t));
 };