- Updated to 3.4-rc1.

[linux-flexiantxendom0-3.2.10.git] / include / scsi / scsi_device.h

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 6677e2f..f421efc 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -1,7 +1,6 @@
 #ifndef _SCSI_SCSI_DEVICE_H
 #define _SCSI_SCSI_DEVICE_H
 
-#include <linux/device.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
@@ -9,6 +8,7 @@
 #include <scsi/scsi.h>
 #include <linux/atomic.h>
 
+struct device;
 struct request_queue;
 struct scsi_cmnd;
 struct scsi_lun;
@@ -136,6 +136,7 @@ struct scsi_device {
        unsigned use_10_for_ms:1; /* first try 10-byte mode sense/select */
        unsigned skip_ms_page_8:1;      /* do not use MODE SENSE page 0x08 */
        unsigned skip_ms_page_3f:1;     /* do not use MODE SENSE page 0x3f */
+       unsigned skip_vpd_pages:1;      /* do not read VPD pages */
        unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
        unsigned no_start_on_add:1;     /* do not issue start on add */
        unsigned allow_restart:1; /* issue START_UNIT in error handler */
@@ -246,8 +247,10 @@ struct scsi_target {
        unsigned int            single_lun:1;   /* Indicates we should only
                                                 * allow I/O to one of the luns
                                                 * for the device at a time. */
-       unsigned int            pdt_1f_for_no_lun;      /* PDT = 0x1f */
-                                               /* means no lun present */
+       unsigned int            pdt_1f_for_no_lun:1;    /* PDT = 0x1f
+                                                * means no lun present. */
+       unsigned int            no_report_luns:1;       /* Don't use
+                                                * REPORT LUNS for scanning. */
        /* commands actually active on LLD. protected by host lock. */
        unsigned int            target_busy;
        /*