1 files changed, 7 insertions, 4 deletions

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 8b4deca996ad..8fcb6e0e9e72 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -114,6 +114,7 @@ struct scsi_cmnd;
 #define READ_12               0xa8
 #define WRITE_12              0xaa
 #define WRITE_VERIFY_12       0xae
+#define VERIFY_12             0xaf
 #define SEARCH_HIGH_12        0xb0
 #define SEARCH_EQUAL_12       0xb1
 #define SEARCH_LOW_12         0xb2
@@ -134,6 +135,7 @@ struct scsi_cmnd;
 #define MO_SET_TARGET_PGS     0x0a
 /* values for variable length command */
 #define READ_32               0x09
+#define VERIFY_32             0x0a
 #define WRITE_32              0x0b
 #define WRITE_SAME_32         0x0d
 
@@ -149,10 +151,10 @@ struct scsi_cmnd;
 
 /* defined in T10 SCSI Primary Commands-2 (SPC2) */
 struct scsi_varlen_cdb_hdr {
-        u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-        u8 control;
-        u8 misc[5];
-        u8 additional_cdb_length;         /* total cdb length - 8 */
+        __u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+        __u8 control;
+        __u8 misc[5];
+        __u8 additional_cdb_length;         /* total cdb length - 8 */
         __be16 service_action;
         /* service specific data follows */
 };
@@ -423,6 +425,7 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define ADD_TO_MLQUEUE  0x2006
 #define TIMEOUT_ERROR   0x2007
 #define SCSI_RETURN_NOT_HANDLED   0x2008
+#define FAST_IO_FAIL    0x2009
 
 /*
  * Midlevel queue return values.