summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.h
diff options
context:
space:
mode:
authorMike Christie <mchristi@redhat.com>2010-08-11 18:06:25 +0200
committerJames Bottomley <James.Bottomley@suse.de>2010-09-05 19:57:04 +0200
commite3b3e6246726cd05950677ed843010b8e8c5884c (patch)
tree587375d4709159d4fe435dabedc6f3fcf0ab71f8 /drivers/scsi/sd.h
parent[SCSI] drivers/message/fusion: Return -ENOMEM on memory allocation failure (diff)
downloadlinux-e3b3e6246726cd05950677ed843010b8e8c5884c.tar.xz
linux-e3b3e6246726cd05950677ed843010b8e8c5884c.zip
[SCSI] scsi/block: increase flush/sync timeout
We have been seeing the flush request timeout with a wide range of hardware from tgt+iser to FC targets from a major vendor. After discussions about if the value should be configurable and what the best value should be, this patch just increases the flush/sync cache timeout to 1 minute. 2 minutes was determined to be too long, and making it configurable was troublesome for users. This patch was made over Linus's tree. It is not made over scsi-misc or scsi-rc-fixes, because Linus's had block layer changes that my patch was built over. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Acked-by: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/sd.h')
-rw-r--r--drivers/scsi/sd.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index f81a9309e6de..315ce9d96b1f 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