1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index f81a9309e6de..55488faf0815 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -19,6 +19,7 @@
  */
 #define SD_TIMEOUT              (30 * HZ)
 #define SD_MOD_TIMEOUT          (75 * HZ)
+#define SD_FLUSH_TIMEOUT        (60 * HZ)
 
 /*
  * Number of allowed retries
@@ -50,7 +51,7 @@ struct scsi_disk {
         atomic_t        openers;
         sector_t        capacity;       /* size in 512-byte sectors */
         u32             index;
-        unsigned short  hw_sector_size;
+        unsigned int    physical_block_size;
         u8              media_present;
         u8              write_prot;
         u8              protection_type;/* Data Integrity Field */
@@ -62,6 +63,9 @@ struct scsi_disk {
         unsigned        first_scan : 1;
         unsigned        thin_provisioning : 1;
         unsigned        unmap : 1;
+        unsigned        tpws : 1;
+        unsigned        tpu : 1;
+        unsigned        tpvpd : 1;
 };
 #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)