diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/scsi/sd.h | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/scsi/sd.h')
-rw-r--r-- | drivers/scsi/sd.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 26895ff..7a049de 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -13,11 +13,7 @@ */ #define SD_TIMEOUT (30 * HZ) #define SD_MOD_TIMEOUT (75 * HZ) -/* - * Flush timeout is a multiplier over the standard device timeout which is - * user modifiable via sysfs but initially set to SD_TIMEOUT - */ -#define SD_FLUSH_TIMEOUT_MULTIPLIER 2 +#define SD_FLUSH_TIMEOUT (60 * HZ) #define SD_WRITE_SAME_TIMEOUT (120 * HZ) /* |