Merge tag 'thermal-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal...

[linux-2.6-microblaze.git] / include / scsi / scsi_device.h

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index f8312a3..c3cba2a 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -110,7 +110,6 @@ struct scsi_device {
        atomic_t device_blocked;        /* Device returned QUEUE_FULL. */
 
        spinlock_t list_lock;
-       struct list_head cmd_list;      /* queue of in use SCSI Command structures */
        struct list_head starved_entry;
        unsigned short queue_depth;     /* How deep of a queue we want */
        unsigned short max_queue_depth; /* max queue depth */
@@ -204,6 +203,9 @@ struct scsi_device {
        unsigned unmap_limit_for_ws:1;  /* Use the UNMAP limit for WRITE SAME */
        unsigned rpm_autosuspend:1;     /* Enable runtime autosuspend at device
                                         * creation time */
+
+       bool offline_already;           /* Device offline message logged */
+
        atomic_t disk_events_disable_depth; /* disable depth for disk events */
 
        DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
@@ -231,7 +233,7 @@ struct scsi_device {
        struct mutex            state_mutex;
        enum scsi_device_state sdev_state;
        struct task_struct      *quiesced_by;
-       unsigned long           sdev_data[0];
+       unsigned long           sdev_data[];
 } __attribute__((aligned(sizeof(unsigned long))));
 
 #define        to_scsi_device(d)       \
@@ -315,7 +317,7 @@ struct scsi_target {
        char                    scsi_level;
        enum scsi_target_state  state;
        void                    *hostdata; /* available to low-level driver */
-       unsigned long           starget_data[0]; /* for the transport */
+       unsigned long           starget_data[]; /* for the transport */
        /* starget_data must be the last element!!!! */
 } __attribute__((aligned(sizeof(unsigned long))));