Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[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 c3cba2a..1a5c9a3 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -109,6 +109,7 @@ struct scsi_device {
        atomic_t device_busy;           /* commands actually active on LLDD */
        atomic_t device_blocked;        /* Device returned QUEUE_FULL. */
 
+       atomic_t restarts;
        spinlock_t list_lock;
        struct list_head starved_entry;
        unsigned short queue_depth;     /* How deep of a queue we want */
@@ -229,6 +230,9 @@ struct scsi_device {
        struct scsi_device_handler *handler;
        void                    *handler_data;
 
+       size_t                  dma_drain_len;
+       void                    *dma_drain_buf;
+
        unsigned char           access_state;
        struct mutex            state_mutex;
        enum scsi_device_state sdev_state;